File tree Expand file tree Collapse file tree 3 files changed +6
-6
lines changed
Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -72,10 +72,10 @@ cat >expect <<'EOF'
7272 branch-two
7373 master
7474EOF
75- test_expect_success C_LOCALE_OUTPUT ' git branch shows detached HEAD properly' '
75+ test_expect_success ' git branch shows detached HEAD properly' '
7676 git checkout HEAD^0 &&
7777 git branch >actual &&
78- test_cmp expect actual
78+ test_i18ncmp expect actual
7979'
8080
8181test_done
Original file line number Diff line number Diff line change @@ -91,12 +91,12 @@ test_expect_success 'cherry-pick on stat-dirty working tree' '
9191 )
9292'
9393
94- test_expect_success C_LOCALE_OUTPUT ' revert forbidden on dirty working tree' '
94+ test_expect_success ' revert forbidden on dirty working tree' '
9595
9696 echo content >extra_file &&
9797 git add extra_file &&
9898 test_must_fail git revert HEAD 2>errors &&
99- grep "Your local changes would be overwritten by " errors
99+ test_i18ngrep "Your local changes would be overwritten by " errors
100100
101101'
102102
Original file line number Diff line number Diff line change @@ -44,7 +44,7 @@ test_expect_success 'failed cherry-pick does not advance HEAD' '
4444 test "$head" = "$newhead"
4545'
4646
47- test_expect_success C_LOCALE_OUTPUT ' advice from failed cherry-pick' "
47+ test_expect_success ' advice from failed cherry-pick' "
4848 pristine_detach initial &&
4949
5050 picked=\$ (git rev-parse --short picked) &&
@@ -56,7 +56,7 @@ test_expect_success C_LOCALE_OUTPUT 'advice from failed cherry-pick' "
5656 EOF
5757 test_must_fail git cherry-pick picked 2>actual &&
5858
59- test_cmp expected actual
59+ test_i18ncmp expected actual
6060"
6161
6262test_expect_success ' failed cherry-pick sets CHERRY_PICK_HEAD' '
You can’t perform that action at this time.
0 commit comments