diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-02 22:58:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-02 22:58:40 (GMT) |
| commit | a75c3523d35144934e97f2660401e05b36ef8083 (patch) | |
| tree | 9856bd72555f4479eefa88d5248eefccea5852f7 /t/t4001-diff-rename.sh | |
| parent | 0d405d72f5ffb499b40dd3a95886ae5a1fc13b30 (diff) | |
| parent | c9ea118e75b1b8f8cc744e372576b4cf63594e0d (diff) | |
| download | git-a75c3523d35144934e97f2660401e05b36ef8083.zip git-a75c3523d35144934e97f2660401e05b36ef8083.tar.gz git-a75c3523d35144934e97f2660401e05b36ef8083.tar.bz2 | |
Merge branch 'ab/i18n-fixup'
* ab/i18n-fixup: (24 commits)
i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
i18n: use test_i18n{grep,cmp} in t7508
i18n: use test_i18ngrep in t7506
i18n: use test_i18ngrep and test_i18ncmp in t7502
i18n: use test_i18ngrep in t7501
i18n: use test_i18ncmp in t7500
i18n: use test_i18ngrep in t7201
i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110
i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060
i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014
i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200
i18n: use test_i18ngrep in lib-httpd and t2019
i18n: do not overuse C_LOCALE_OUTPUT (grep)
i18n: use test_i18ncmp in t1200 and t2200
i18n: .git file is not a human readable message (t5601)
i18n: do not overuse C_LOCALE_OUTPUT
i18n: mark init-db messages for translation
i18n: mark checkout plural warning for translation
i18n: mark checkout --detach messages for translation
...
Diffstat (limited to 't/t4001-diff-rename.sh')
| -rwxr-xr-x | t/t4001-diff-rename.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh index 3dadf9b..844277c 100755 --- a/t/t4001-diff-rename.sh +++ b/t/t4001-diff-rename.sh @@ -64,18 +64,18 @@ test_expect_success \ 'validate the output.' \ 'compare_diff_patch current expected' -test_expect_success C_LOCALE_OUTPUT 'favour same basenames over different ones' ' +test_expect_success 'favour same basenames over different ones' ' cp path1 another-path && git add another-path && git commit -m 1 && git rm path1 && mkdir subdir && git mv another-path subdir/path1 && - git status | grep "renamed: .*path1 -> subdir/path1"' + git status | test_i18ngrep "renamed: .*path1 -> subdir/path1"' -test_expect_success C_LOCALE_OUTPUT 'favour same basenames even with minor differences' ' +test_expect_success 'favour same basenames even with minor differences' ' git show HEAD:path1 | sed "s/15/16/" > subdir/path1 && - git status | grep "renamed: .*path1 -> subdir/path1"' + git status | test_i18ngrep "renamed: .*path1 -> subdir/path1"' test_expect_success 'setup for many rename source candidates' ' git reset --hard && |