diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-30 14:49:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-30 14:49:41 -0800 |
| commit | 376b4cc420182a72c46da6a12f53157cadd81bd5 (patch) | |
| tree | 86d1d1854047ebecea2a5a405aedddfb84faaec9 /t | |
| parent | Merge branch 'js/t3040-cleanup' (diff) | |
| parent | t4015: let the test pass with any default branch name (diff) | |
| download | tgif-376b4cc420182a72c46da6a12f53157cadd81bd5.tar.xz | |
Merge branch 'js/t4015-wo-master'
A test script got cleaned up not to depend on the value of
init.defaultBranch.
* js/t4015-wo-master:
t4015: let the test pass with any default branch name
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4015-diff-whitespace.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index 8bdaa0a693..47f0e2889d 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -877,13 +877,13 @@ test_expect_success 'rename empty' ' test_expect_success 'combined diff with autocrlf conversion' ' git reset --hard && - echo >x hello && - git commit -m "one side" x && + test_commit "one side" x hello one-side && git checkout HEAD^ && 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 one-side >actual && + test_i18ngrep "Automatic merge failed" actual && git diff >actual.raw && sed -e "1,/^@@@/d" actual.raw >actual && |