From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Daniels Umanovskis <daniels@umanovskis.se>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 1/1] branch: introduce --show-current display option
Date: Fri, 12 Oct 2018 00:53:26 +0200 [thread overview]
Message-ID: <20181011225326.GC19800@szeder.dev> (raw)
In-Reply-To: <20181010205432.11990-2-daniels@umanovskis.se>
On Wed, Oct 10, 2018 at 10:54:32PM +0200, Daniels Umanovskis wrote:
[...]
> diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
> index ee6787614..e9bc3b05f 100755
> --- a/t/t3203-branch-output.sh
> +++ b/t/t3203-branch-output.sh
> @@ -100,6 +100,47 @@ test_expect_success 'git branch -v pattern does not show branch summaries' '
> test_must_fail git branch -v branch*
> '
>
> +test_expect_success 'git branch `--show-current` shows current branch' '
> + cat >expect <<-\EOF &&
> + branch-two
> + EOF
> + git checkout branch-two &&
Up to this point everything talked about '--show-current' ...
> + git branch --current >actual &&
... but here and in all the following tests you run
git branch --current
which then fails with "error: unknown option `current'"
> + test_cmp expect actual
> +'
> +
> +test_expect_success 'git branch `--show-current` is silent when detached HEAD' '
> + git checkout HEAD^0 &&
> + git branch --current >actual &&
> + test_must_be_empty actual
> +'
> +
> +test_expect_success 'git branch `--show-current` works properly when tag exists' '
> + cat >expect <<-\EOF &&
> + branch-and-tag-name
> + EOF
> + git checkout -b branch-and-tag-name &&
> + git tag branch-and-tag-name &&
> + git branch --current >actual &&
> + git checkout branch-one &&
> + git branch -d branch-and-tag-name &&
> + test_cmp expect actual
> +'
> +
> +test_expect_success 'git branch `--show-current` works properly with worktrees' '
> + cat >expect <<-\EOF &&
> + branch-one
> + branch-two
> + EOF
> + git checkout branch-one &&
> + git branch --current >actual &&
> + git worktree add worktree branch-two &&
> + cd worktree &&
> + git branch --current >>../actual &&
> + cd .. &&
> + test_cmp expect actual
> +'
> +
> test_expect_success 'git branch shows detached HEAD properly' '
> cat >expect <<EOF &&
> * (HEAD detached at $(git rev-parse --short HEAD^0))
> --
> 2.19.1.330.g93276587c.dirty
>
next prev parent reply other threads:[~2018-10-11 22:53 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-10 20:54 [PATCH v2 0/1] branch: introduce --show-current display option Daniels Umanovskis
2018-10-10 20:54 ` [PATCH v2 1/1] " Daniels Umanovskis
2018-10-11 0:34 ` Jeff King
2018-10-11 15:43 ` Rafael Ascensão
2018-10-11 16:36 ` Daniels Umanovskis
2018-10-11 17:51 ` Jeff King
2018-10-11 20:35 ` Rafael Ascensão
2018-10-11 20:46 ` Daniels Umanovskis
2018-10-11 20:53 ` Jeff King
2018-10-11 22:34 ` Rafael Ascensão
2018-10-11 6:54 ` Junio C Hamano
2018-10-11 17:29 ` Daniels Umanovskis
2018-10-11 17:52 ` Jeff King
2018-10-11 22:20 ` [PATCH v3] " Daniels Umanovskis
2018-10-11 23:15 ` Junio C Hamano
2018-10-11 23:31 ` Daniels Umanovskis
2018-10-12 13:33 ` [PATCH v4] " Daniels Umanovskis
2018-10-12 13:43 ` Eric Sunshine
2018-10-16 23:09 ` Junio C Hamano
2018-10-16 23:26 ` Eric Sunshine
2018-10-17 10:18 ` Johannes Schindelin
2018-10-17 10:39 ` Eric Sunshine
2018-10-18 9:51 ` Johannes Schindelin
2018-10-18 14:19 ` Eric Sunshine
2018-10-16 5:59 ` Junio C Hamano
2018-10-17 9:39 ` Rafael Ascensão
2018-10-17 17:36 ` Daniels Umanovskis
2018-10-11 22:53 ` SZEDER Gábor [this message]
2018-10-11 22:56 ` [PATCH v2 1/1] " SZEDER Gábor
2018-10-11 22:58 ` Daniels Umanovskis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181011225326.GC19800@szeder.dev \
--to=szeder.dev@gmail.com \
--cc=daniels@umanovskis.se \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).