Skip to content

Commit a373f93

Browse files
newrengitster
authored andcommitted
t7615: be more explicit about diff algorithm used
t7615 is entirely about testing the differences about different diff algorithms, but it doesn't specify any diff algorithm when it is testing myers. Given that we have discussed potentially switching defaults (https://lore.kernel.org/git/[email protected]/), it makes sense in tests that are about different diff algorithms to be explicitly about which one is intended to be used in each test. Add that specificity. Signed-off-by: Elijah Newren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9c69ad2 commit a373f93

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

t/t7615-diff-algo-with-mergy-operations.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ GIT_TEST_MERGE_ALGORITHM=recursive
2626

2727
test_expect_success 'merge c2 to c1 with recursive merge strategy fails with the current default myers diff algorithm' '
2828
git reset --hard c1 &&
29-
test_must_fail git merge -s recursive c2
29+
test_must_fail git merge -s recursive -Xdiff-algorithm=myers c2
3030
'
3131

3232
test_expect_success 'merge c2 to c1 with recursive merge strategy succeeds with -Xdiff-algorithm=histogram' '
@@ -42,7 +42,7 @@ test_expect_success 'merge c2 to c1 with recursive merge strategy succeeds with
4242

4343
test_expect_success 'cherry-pick c2 to c1 with recursive merge strategy fails with the current default myers diff algorithm' '
4444
git reset --hard c1 &&
45-
test_must_fail git cherry-pick -s recursive c2
45+
test_must_fail git cherry-pick -s recursive -Xdiff-algorithm=myers c2
4646
'
4747

4848
test_expect_success 'cherry-pick c2 to c1 with recursive merge strategy succeeds with -Xdiff-algorithm=histogram' '

0 commit comments

Comments
 (0)