diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-12 23:23:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-13 22:52:47 (GMT) |
| commit | fff1bb3a349687e262ba4fcf5f333af07be9d149 (patch) | |
| tree | c99244134339e8bc5152f7bfcef98c80149e9135 | |
| parent | f2c8c8007c43b75e6a461137364a3ec65108afbc (diff) | |
| download | git-fff1bb3a349687e262ba4fcf5f333af07be9d149.zip git-fff1bb3a349687e262ba4fcf5f333af07be9d149.tar.gz git-fff1bb3a349687e262ba4fcf5f333af07be9d149.tar.bz2 | |
i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t3203-branch-output.sh | 4 | ||||
| -rwxr-xr-x | t/t3501-revert-cherry-pick.sh | 4 | ||||
| -rwxr-xr-x | t/t3507-cherry-pick-conflict.sh | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh index 4ef7d09..6b7c118 100755 --- a/t/t3203-branch-output.sh +++ b/t/t3203-branch-output.sh @@ -72,10 +72,10 @@ cat >expect <<'EOF' branch-two master EOF -test_expect_success C_LOCALE_OUTPUT 'git branch shows detached HEAD properly' ' +test_expect_success 'git branch shows detached HEAD properly' ' git checkout HEAD^0 && git branch >actual && - test_cmp expect actual + test_i18ncmp expect actual ' test_done diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh index 753a6c9..595d2ff 100755 --- a/t/t3501-revert-cherry-pick.sh +++ b/t/t3501-revert-cherry-pick.sh @@ -91,12 +91,12 @@ test_expect_success 'cherry-pick on stat-dirty working tree' ' ) ' -test_expect_success C_LOCALE_OUTPUT 'revert forbidden on dirty working tree' ' +test_expect_success 'revert forbidden on dirty working tree' ' echo content >extra_file && git add extra_file && test_must_fail git revert HEAD 2>errors && - grep "Your local changes would be overwritten by " errors + test_i18ngrep "Your local changes would be overwritten by " errors ' diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index c0c8330..212ec54 100755 --- a/t/t3507-cherry-pick-conflict.sh +++ b/t/t3507-cherry-pick-conflict.sh @@ -44,7 +44,7 @@ test_expect_success 'failed cherry-pick does not advance HEAD' ' test "$head" = "$newhead" ' -test_expect_success C_LOCALE_OUTPUT 'advice from failed cherry-pick' " +test_expect_success 'advice from failed cherry-pick' " pristine_detach initial && picked=\$(git rev-parse --short picked) && @@ -56,7 +56,7 @@ test_expect_success C_LOCALE_OUTPUT 'advice from failed cherry-pick' " EOF test_must_fail git cherry-pick picked 2>actual && - test_cmp expected actual + test_i18ncmp expected actual " test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' ' |