Merge branch 'la/strvec-comment-fix' into maint-2.43

[thirdparty/git.git] / t / t5510-fetch.sh

diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 19c36b57f4b2d5363599625ea71ee5a9a87509b0..91e87b1dd3a5dceb8af2ab614e1d968866dc8b28 100755 (executable)
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -415,9 +415,9 @@ test_expect_success 'fetch uses remote ref names to describe new refs' '
        (
                cd descriptive &&
                git fetch o 2>actual &&
-               test_i18ngrep "new branch.* -> refs/crazyheads/descriptive-branch$" actual &&
-               test_i18ngrep "new tag.* -> descriptive-tag$" actual &&
-               test_i18ngrep "new ref.* -> crazy$" actual
+               test_grep "new branch.* -> refs/crazyheads/descriptive-branch$" actual &&
+               test_grep "new tag.* -> descriptive-tag$" actual &&
+               test_grep "new ref.* -> crazy$" actual
        ) &&
        git checkout main
 '
@@ -802,7 +802,8 @@ test_expect_success 'fetch.writeCommitGraph with submodules' '
                cd super-clone &&
                rm -rf .git/objects/info &&
                git -c fetch.writeCommitGraph=true fetch origin &&
-               test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain
+               test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain &&
+               git -c fetch.writeCommitGraph=true fetch --recurse-submodules origin
        )
 '
 
@@ -1113,7 +1114,7 @@ test_expect_success 'fetching with auto-gc does not lock up' '
                git config gc.autoPackLimit 1 &&
                git config gc.autoDetach false &&
                GIT_ASK_YESNO="$D/askyesno" git fetch --verbose >fetch.out 2>&1 &&
-               test_i18ngrep "Auto packing the repository" fetch.out &&
+               test_grep "Auto packing the repository" fetch.out &&
                ! grep "Should I try again" fetch.out
        )
 '