From: Johannes Schindelin <johannes.schindelin@xxxxxx>
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 <johannes.schindelin@xxxxxx>
---
t4015: let the test pass with any default branch name
Aaaaand another issue, also found while working on
https://github.com/gitgitgadget/git/pull/762.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-794%2Fdscho%2Ft4015-and-default-branch-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-794/dscho/t4015-and-default-branch-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/794
t/t4015-diff-whitespace.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index 8bdaa0a693..c9dd62b70e 100755
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -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
--
gitgitgadget
