diff options
author | Elijah Newren <newren@gmail.com> | 2020-10-26 17:01:41 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-10-26 19:31:24 (GMT) |
commit | c8c35f6a02f3841d4383a5ce4c9d8e426776d151 (patch) | |
tree | 379488292d01fceabc6548854eb1e87b9e764d61 /t/t6402-merge-rename.sh | |
parent | c12d1f2ac227cbec44be27de83ef07d135f243c2 (diff) | |
download | git-c8c35f6a02f3841d4383a5ce4c9d8e426776d151.zip git-c8c35f6a02f3841d4383a5ce4c9d8e426776d151.tar.gz git-c8c35f6a02f3841d4383a5ce4c9d8e426776d151.tar.bz2 |
merge tests: expect slight differences in output for recursive vs. ort
The ort merge strategy has some slight differences in commit
descriptions (shortened hashes), stdout vs stderr, and in conflict
messages. Also, builtin/merge.c reports usage of "ort" as "Merge made
by the 'ort' strategy" -- while it is meant as a drop in replacement for
"recursive" it is not yet treated as though it is recursive. Update the
testcases to expect different output for the different merge backends.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6402-merge-rename.sh')
-rwxr-xr-x | t/t6402-merge-rename.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/t/t6402-merge-rename.sh b/t/t6402-merge-rename.sh index 47d4434..3f64f62 100755 --- a/t/t6402-merge-rename.sh +++ b/t/t6402-merge-rename.sh @@ -320,7 +320,12 @@ test_expect_success 'Rename+D/F conflict; renamed file merges but dir in way' ' test_i18ngrep "CONFLICT (modify/delete): dir/file-in-the-way" output && test_i18ngrep "Auto-merging dir" output && - test_i18ngrep "Adding as dir~HEAD instead" output && + if test "$GIT_TEST_MERGE_ALGORITHM" = ort + then + test_i18ngrep "moving it to dir~HEAD instead" output + else + test_i18ngrep "Adding as dir~HEAD instead" output + fi && test 3 -eq "$(git ls-files -u | wc -l)" && test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" && @@ -342,7 +347,12 @@ test_expect_success 'Same as previous, but merged other way' ' ! grep "error: refusing to lose untracked file at" errors && test_i18ngrep "CONFLICT (modify/delete): dir/file-in-the-way" output && test_i18ngrep "Auto-merging dir" output && - test_i18ngrep "Adding as dir~renamed-file-has-no-conflicts instead" output && + if test "$GIT_TEST_MERGE_ALGORITHM" = ort + then + test_i18ngrep "moving it to dir~renamed-file-has-no-conflicts instead" output + else + test_i18ngrep "Adding as dir~renamed-file-has-no-conflicts instead" output + fi && test 3 -eq "$(git ls-files -u | wc -l)" && test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" && |