diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-02 15:58:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-02 15:58:40 -0700 |
| commit | a75c3523d35144934e97f2660401e05b36ef8083 (patch) | |
| tree | 9856bd72555f4479eefa88d5248eefccea5852f7 /t/t7060-wtstatus.sh | |
| parent | 0d405d72f5ffb499b40dd3a95886ae5a1fc13b30 (diff) | |
| parent | c9ea118e75b1b8f8cc744e372576b4cf63594e0d (diff) | |
| download | git-a75c3523d35144934e97f2660401e05b36ef8083.tar.gz git-a75c3523d35144934e97f2660401e05b36ef8083.tar.xz | |
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/t7060-wtstatus.sh')
| -rwxr-xr-x | t/t7060-wtstatus.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh index 3a5d927f8..b8cb4906a 100755 --- a/t/t7060-wtstatus.sh +++ b/t/t7060-wtstatus.sh @@ -38,7 +38,7 @@ cat >expect <<EOF no changes added to commit (use "git add" and/or "git commit -a") EOF -test_expect_success C_LOCALE_OUTPUT 'M/D conflict does not segfault' ' +test_expect_success 'M/D conflict does not segfault' ' mkdir mdconflict && ( cd mdconflict && @@ -50,9 +50,9 @@ test_expect_success C_LOCALE_OUTPUT 'M/D conflict does not segfault' ' git commit -m delete && test_must_fail git merge master && test_must_fail git commit --dry-run >../actual && - test_cmp ../expect ../actual && + test_i18ncmp ../expect ../actual && git status >../actual && - test_cmp ../expect ../actual + test_i18ncmp ../expect ../actual ) ' |