undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: git-status "nothing to commit" messages

Browse Source 
Gettextize the "nothing to commit" messages. Many tests explicitly
checked for this message. Change them to skip under
GETTEXT_POISON=YesPlease.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2011-02-22 23:42:14 +00:00 committed by Junio C Hamano
parent 355ec7a130
commit 8ec9bc0dd5
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
t/t7506-status-submodule.sh
View File

@ -20,12 +20,12 @@ test_expect_success 'setup' '
git commit -m "Add submodule sub" git commit -m "Add submodule sub"
' '
test_expect_success 'status clean' ' test_expect_success C_LOCALE_OUTPUT 'status clean' '
git status >output && git status >output &&
grep "nothing to commit" output grep "nothing to commit" output
' '
test_expect_success 'commit --dry-run -a clean' ' test_expect_success C_LOCALE_OUTPUT 'commit --dry-run -a clean' '
test_must_fail git commit --dry-run -a >output && test_must_fail git commit --dry-run -a >output &&
grep "nothing to commit" output grep "nothing to commit" output
' '
@ -177,12 +177,12 @@ test_expect_success 'rm submodule contents' '
rm -rf sub/* sub/.git rm -rf sub/* sub/.git
' '
test_expect_success 'status clean (empty submodule dir)' ' test_expect_success C_LOCALE_OUTPUT 'status clean (empty submodule dir)' '
git status >output && git status >output &&
grep "nothing to commit" output grep "nothing to commit" output
' '
test_expect_success 'status -a clean (empty submodule dir)' ' test_expect_success C_LOCALE_OUTPUT 'status -a clean (empty submodule dir)' '
test_must_fail git commit --dry-run -a >output && test_must_fail git commit --dry-run -a >output &&
grep "nothing to commit" output grep "nothing to commit" output
' '

12
wt-status.c
View File

@ -763,14 +763,14 @@ void wt_status_print(struct wt_status *s)
advice_status_hints advice_status_hints
? _(" (use \"git add\" to track)") : ""); ? _(" (use \"git add\" to track)") : "");
else if (s->is_initial) else if (s->is_initial)
printf("nothing to commit%s\n", advice_status_hints printf(_("nothing to commit%s\n"), advice_status_hints
? " (create/copy files and use \"git add\" to track)" : ""); ? _(" (create/copy files and use \"git add\" to track)") : "");
else if (!s->show_untracked_files) else if (!s->show_untracked_files)
printf("nothing to commit%s\n", advice_status_hints printf(_("nothing to commit%s\n"), advice_status_hints
? " (use -u to show untracked files)" : ""); ? _(" (use -u to show untracked files)") : "");
else else
printf("nothing to commit%s\n", advice_status_hints printf(_("nothing to commit%s\n"), advice_status_hints
? " (working directory clean)" : ""); ? _(" (working directory clean)") : "");
} }
} }