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/xmqqed873vgn.fsf@gitster.g/), 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 <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Mar 16, 2025 at 06:58 UTC
a373f93370a9c8980f02d24ab06a333cec67f89b
1 file changed
+2
-2
t/t7615-diff-algo-with-mergy-operations.sh
+2
-2
@@ -26,7 +26,7 @@ GIT_TEST_MERGE_ALGORITHM=recursive
26
27
test_expect_success 'merge c2 to c1 with recursive merge strategy fails with the current default myers diff algorithm' '
28
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
30
'
31
32
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
42
43
test_expect_success 'cherry-pick c2 to c1 with recursive merge strategy fails with the current default myers diff algorithm' '
44
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
46
'
47
48
test_expect_success 'cherry-pick c2 to c1 with recursive merge strategy succeeds with -Xdiff-algorithm=histogram' '