diff options
| author | Vasco Almeida <vascomalmeida@sapo.pt> | 2016-06-17 20:20:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-17 22:45:47 (GMT) |
| commit | e9f3cec494330a86a412adaee95360ddea6fcf54 (patch) | |
| tree | 983c3d0e3aa4f1244b650bb52954baf84a6e1c01 | |
| parent | 070b7e441649b9c2543fda7bfbef0ad58761f869 (diff) | |
| download | git-e9f3cec494330a86a412adaee95360ddea6fcf54.zip git-e9f3cec494330a86a412adaee95360ddea6fcf54.tar.gz git-e9f3cec494330a86a412adaee95360ddea6fcf54.tar.bz2 | |
i18n: advice: mark string about detached head for translation
Mark string with advice seen by the user when in detached head.
Update test t7201-co.sh to pass under GETTEXT_POISON build. Pretend
success if the number of lines of "git checkout renamer^" output is not
greater than 1 and test are running under GETTEXT_POISON.
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | advice.c | 6 | ||||
| -rwxr-xr-x | t/t7201-co.sh | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -106,14 +106,14 @@ void NORETURN die_conclude_merge(void) void detach_advice(const char *new_name) { - const char fmt[] = - "Note: checking out '%s'.\n\n" + const char *fmt = + _("Note: checking out '%s'.\n\n" "You are in 'detached HEAD' state. You can look around, make experimental\n" "changes and commit them, and you can discard any commits you make in this\n" "state without impacting any branches by performing another checkout.\n\n" "If you want to create a new branch to retain commits you create, you may\n" "do so (now or later) by using -b with the checkout command again. Example:\n\n" - " git checkout -b <new-branch-name>\n\n"; + " git checkout -b <new-branch-name>\n\n"); fprintf(stderr, fmt, new_name); } diff --git a/t/t7201-co.sh b/t/t7201-co.sh index 8859236..d4b217b 100755 --- a/t/t7201-co.sh +++ b/t/t7201-co.sh @@ -257,7 +257,7 @@ test_expect_success 'checkout to detach HEAD' ' git checkout -f renamer && git clean -f && git checkout renamer^ 2>messages && test_i18ngrep "HEAD is now at 7329388" messages && - test_line_count -gt 1 messages && + (test_line_count -gt 1 messages || test -n "$GETTEXT_POISON") && H=$(git rev-parse --verify HEAD) && M=$(git show-ref -s --verify refs/heads/master) && test "z$H" = "z$M" && |