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/t7602-merge-octopus-many.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/t7602-merge-octopus-many.sh')
| -rwxr-xr-x | t/t7602-merge-octopus-many.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh index 6abe441..13859ec 100755 --- a/t/t7602-merge-octopus-many.sh +++ b/t/t7602-merge-octopus-many.sh @@ -77,6 +77,12 @@ Merge made by the 'recursive' strategy. EOF test_expect_success 'merge reduces irrelevant remote heads' ' + if test "$GIT_TEST_MERGE_ALGORITHM" = ort + then + mv expected expected.tmp && + sed s/recursive/ort/ expected.tmp >expected && + rm expected.tmp + fi && GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual && test_i18ncmp expected actual ' |