Merge branch 'rs/parse-options-with-keep-unknown-abbrev-fix'

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

diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index bcf524d5495cfc5f11e441a663284af1bc45b02b..33d34d5ae9e953e29f6dba8badb16922072cd76c 100755 (executable)
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -169,6 +169,7 @@ test_expect_success REFFILES 'fetch --prune fails to delete branches' '
        git clone . prune-fail &&
        cd prune-fail &&
        git update-ref refs/remotes/origin/extrabranch main &&
+       git pack-refs --all &&
        : this will prevent --prune from locking packed-refs for deleting refs, but adding loose refs still succeeds  &&
        >.git/packed-refs.new &&
 
@@ -415,9 +416,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
 '
@@ -1114,7 +1115,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
        )
 '