[PATCH 3/5] t7615: be more explicit about diff algorithm used
- From
Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Mar 16, 2025, 06:58 UTC
- Message-ID
- <9f6a1669f39d26db8c9cd5c9db290f8708dce89b.1742108339.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.1882.git.1742108339.gitgitgadget@gmail.com>
From: Elijah Newren <newren@gmail.com>
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> --- t/t7615-diff-algo-with-mergy-operations.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t7615-diff-algo-with-mergy-operations.sh b/t/t7615-diff-algo-with-mergy-operations.sh index 3b1aad0167a..ac5863e788c 100755 --- a/t/t7615-diff-algo-with-mergy-operations.sh +++ b/t/t7615-diff-algo-with-mergy-operations.sh @@ -26,7 +26,7 @@ GIT_TEST_MERGE_ALGORITHM=recursive test_expect_success 'merge c2 to c1 with recursive merge strategy fails with the current default myers diff algorithm' ' git reset --hard c1 && - test_must_fail git merge -s recursive c2 + test_must_fail git merge -s recursive -Xdiff-algorithm=myers c2 ' 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 test_expect_success 'cherry-pick c2 to c1 with recursive merge strategy fails with the current default myers diff algorithm' ' git reset --hard c1 && - test_must_fail git cherry-pick -s recursive c2 + test_must_fail git cherry-pick -s recursive -Xdiff-algorithm=myers c2 ' test_expect_success 'cherry-pick c2 to c1 with recursive merge strategy succeeds with -Xdiff-algorithm=histogram' '
-- gitgitgadget