From: Junio C Hamano <gitster@pobox.com>
To: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 2/3] t2106: make test independent of the current main branch name
Date: Wed, 18 Nov 2020 10:26:23 -0800 [thread overview]
Message-ID: <xmqqsg961pyo.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <d477b02b5a3ca6d2beef5bdea21407a3c555f83e.1605710947.git.gitgitgadget@gmail.com> (Johannes Schindelin via GitGitGadget's message of "Wed, 18 Nov 2020 14:49:06 +0000")
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> We do have this wonderful shortcut `git checkout -` to go back to the
> previous branch, thanks to the reflog.
;-)
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> t/t2106-update-index-assume-unchanged.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t2106-update-index-assume-unchanged.sh b/t/t2106-update-index-assume-unchanged.sh
> index ff0947f388..3396f23363 100755
> --- a/t/t2106-update-index-assume-unchanged.sh
> +++ b/t/t2106-update-index-assume-unchanged.sh
> @@ -20,7 +20,7 @@ test_expect_success 'do not switch branches with dirty file' '
> git checkout other &&
> echo dirt >file &&
> git update-index --assume-unchanged file &&
> - test_must_fail git checkout master
> + test_must_fail git checkout -
> '
>
> test_done
next prev parent reply other threads:[~2020-11-18 18:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-18 14:49 [PATCH 0/3] t2106 vs. the default branch name Johannes Schindelin via GitGitGadget
2020-11-18 14:49 ` [PATCH 1/3] t2106: adjust style to the current conventions Johannes Schindelin via GitGitGadget
2020-11-18 14:49 ` [PATCH 2/3] t2106: make test independent of the current main branch name Johannes Schindelin via GitGitGadget
2020-11-18 18:26 ` Junio C Hamano [this message]
2020-11-18 14:49 ` [PATCH 3/3] t2106: ensure that the checkout fails for the expected reason Johannes Schindelin via GitGitGadget
2020-11-18 20:46 ` [PATCH 0/3] t2106 vs. the default branch name Junio C Hamano
2020-11-18 20:56 ` Johannes Schindelin
2020-11-18 21:53 ` Junio C Hamano
2020-11-18 22:25 ` Johannes Schindelin
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=xmqqsg961pyo.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=johannes.schindelin@gmx.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.