mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Johannes Schindelin via GitGitGadget" <>
Cc: Johannes Schindelin <>,
	Johannes Schindelin <>
Subject: [PATCH] t4015: let the test pass with any default branch name
Date: Wed, 18 Nov 2020 19:26:33 +0000	[thread overview]
Message-ID: <> (raw)

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.

Strangely enough, this test case would have succeeded even with an
overridden default branch name, obviously for the wrong reason. Let's
verify that it passes for the expected reason, by looking for a
tell-tale in Git's output.

Signed-off-by: Johannes Schindelin <>
    t4015: let the test pass with any default branch name
    Aaaaand another issue, also found while working on

Fetch-It-Via: git fetch pr-794/dscho/t4015-and-default-branch-v1

 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 19:27 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-18 19:26 Johannes Schindelin via GitGitGadget [this message]
2020-11-18 20:20 ` [PATCH] t4015: let the test pass with any default branch name Junio C Hamano
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).