mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <>
To: "Johannes Schindelin via GitGitGadget" <>
Cc:, Johannes Schindelin <>
Subject: Re: [PATCH] t4015: let the test pass with any default branch name
Date: Wed, 18 Nov 2020 12:20:56 -0800	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <> (Johannes Schindelin via GitGitGadget's message of "Wed, 18 Nov 2020 19:26:33 +0000")

"Johannes Schindelin via GitGitGadget" <>

> From: Johannes Schindelin <>
> We do not need to hard-code the actual branch name, as we have access to
> the reflog and can be a lot more precise at what we want.

I am not enthused to see us going beyond "@{1}" or "@{-1}".  It
would make the test a bit too brittle as a future changes need to
refrain from creating another commit and/or switching to a third
branch to do some more set-up before coming here to attempt an

In this particular case, "git merge @{-1}" may be more robust from
that point of view


>  t/ | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> diff --git a/t/ b/t/
> index 8bdaa0a693..c9dd62b70e 100755
> --- a/t/
> +++ b/t/
> @@ -883,7 +883,8 @@ test_expect_success 'combined diff with autocrlf conversion' '
>  	echo >x goodbye &&
>  	git commit -m "the other side" x &&
>  	git config core.autocrlf true &&
> -	test_must_fail git merge master &&
> +	test_must_fail git merge @{2} >actual &&
> +	test_i18ngrep "Automatic merge failed" actual &&
>  	git diff >actual.raw &&
>  	sed -e "1,/^@@@/d" actual.raw >actual &&
> base-commit: e31aba42fb12bdeb0f850829e008e1e3f43af500

  reply	other threads:[~2020-11-18 20:22 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-18 19:26 [PATCH] t4015: let the test pass with any default branch name Johannes Schindelin via GitGitGadget
2020-11-18 20:20 ` Junio C Hamano [this message]
2020-11-18 23:13   ` Johannes Schindelin
2020-11-18 23:35 ` [PATCH v2] " Johannes Schindelin via GitGitGadget

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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \

* 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.
Code repositories for project(s) associated with this public inbox

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 read-only IMAP folder(s) and NNTP newsgroup(s).