summaryrefslogtreecommitdiffstats
path: root/t/t7508-status.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-13 20:24:10 +0200
committerJunio C Hamano <gitster@pobox.com>2016-07-13 20:24:10 +0200
commit2703572b3a005848ed058d2775fb933a17ac3656 (patch)
tree8e4d016d4f8eb1975fb2b2325bdafd5ca74cd40f /t/t7508-status.sh
parentSync with v2.9.1 (diff)
parentt5541: become resilient to GETTEXT_POISON (diff)
downloadgit-2703572b3a005848ed058d2775fb933a17ac3656.tar.xz
git-2703572b3a005848ed058d2775fb933a17ac3656.zip
Merge branch 'va/i18n-even-more'
More markings of messages for i18n, with updates to various tests to pass GETTEXT_POISON tests. One patch from the original submission dropped due to conflicts with jk/upload-pack-hook, which is still in flux. * va/i18n-even-more: (38 commits) t5541: become resilient to GETTEXT_POISON i18n: branch: mark comment when editing branch description for translation i18n: unmark die messages for translation i18n: submodule: escape shell variables inside eval_gettext i18n: submodule: join strings marked for translation i18n: init-db: join message pieces i18n: remote: allow translations to reorder message i18n: remote: mark URL fallback text for translation i18n: standardise messages i18n: sequencer: add period to error message i18n: merge: change command option help to lowercase i18n: merge: mark messages for translation i18n: notes: mark options for translation i18n: notes: mark strings for translation i18n: transport-helper.c: change N_() call to _() i18n: bisect: mark strings for translation t5523: use test_i18ngrep for negation t4153: fix negated test_i18ngrep call t9003: become resilient to GETTEXT_POISON tests: unpack-trees: update to use test_i18n* functions ...
Diffstat (limited to 't/t7508-status.sh')
-rwxr-xr-xt/t7508-status.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index c3ed7cb51c..b3bdd162aa 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -1377,7 +1377,7 @@ EOF
git config --add -f .gitmodules submodule.subname.ignore all &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status > output &&
- test_cmp expect output &&
+ test_i18ncmp expect output &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1387,7 +1387,7 @@ test_expect_success '.git/config ignore=all suppresses unstaged submodule summar
git config --add submodule.subname.ignore all &&
git config --add submodule.subname.path sm &&
git status > output &&
- test_cmp expect output &&
+ test_i18ncmp expect output &&
git config --remove-section submodule.subname &&
git config -f .gitmodules --remove-section submodule.subname
'