pack-redundant: consistent sort method

diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh
index 4bf1dbe9c9f3ffeb1151be07bf75dcd872167916..b92ff95977281e7ebb727fe5079e03aa301f4111 100755 (executable)
--- a/t/t3900-i18n-commit.sh
+++ b/t/t3900-i18n-commit.sh
@@ -40,40 +40,40 @@ test_expect_success 'UTF-16 refused because of NULs' '
 '
 
 test_expect_success 'UTF-8 invalid characters refused' '
-       test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
+       test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
        echo "UTF-8 characters" >F &&
        printf "Commit message\n\nInvalid surrogate:\355\240\200\n" \
                >"$HOME/invalid" &&
        git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
-       grep "did not conform" "$HOME"/stderr
+       test_i18ngrep "did not conform" "$HOME"/stderr
 '
 
 test_expect_success 'UTF-8 overlong sequences rejected' '
-       test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
+       test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
        rm -f "$HOME/stderr" "$HOME/invalid" &&
        echo "UTF-8 overlong" >F &&
        printf "\340\202\251ommit message\n\nThis is not a space:\300\240\n" \
                >"$HOME/invalid" &&
        git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
-       grep "did not conform" "$HOME"/stderr
+       test_i18ngrep "did not conform" "$HOME"/stderr
 '
 
 test_expect_success 'UTF-8 non-characters refused' '
-       test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
+       test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
        echo "UTF-8 non-character 1" >F &&
        printf "Commit message\n\nNon-character:\364\217\277\276\n" \
                >"$HOME/invalid" &&
        git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
-       grep "did not conform" "$HOME"/stderr
+       test_i18ngrep "did not conform" "$HOME"/stderr
 '
 
 test_expect_success 'UTF-8 non-characters refused' '
-       test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
+       test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
        echo "UTF-8 non-character 2." >F &&
        printf "Commit message\n\nNon-character:\357\267\220\n" \
                >"$HOME/invalid" &&
        git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
-       grep "did not conform" "$HOME"/stderr
+       test_i18ngrep "did not conform" "$HOME"/stderr
 '
 
 for H in ISO8859-1 eucJP ISO-2022-JP