summaryrefslogtreecommitdiff
path: root/wt-status.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-17 13:50:27 -0700
committerJunio C Hamano <gitster@pobox.com>2017-03-17 13:50:27 -0700
commit58e97730d9868364ea63afbf3ee94fc9b3f3a075 (patch)
treee4f7c68a340635c22f003072b322fa493ff396c2 /wt-status.c
parent153e0d762c15d8a85f0070cd01aff45f5c232e3f (diff)
parentb9e2bc560a1ea29ff833981d5bc70323c265bdb7 (diff)
downloadgit-58e97730d9868364ea63afbf3ee94fc9b3f3a075.tar.gz
Merge branch 'mg/status-porcelain-no-i18n'
"git status --porcelain" is supposed to give a stable output, but a few strings were left as translatable by mistake. * mg/status-porcelain-no-i18n: git-status: make porcelain more robust
Diffstat (limited to 'wt-status.c')
-rw-r--r--wt-status.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/wt-status.c b/wt-status.c
index a8d1faf80d..cc446f26ba 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1730,12 +1730,14 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
return;
branch_name = s->branch;
+#define LABEL(string) (s->no_gettext ? (string) : _(string))
+
if (s->is_initial)
- color_fprintf(s->fp, header_color, _("Initial commit on "));
+ color_fprintf(s->fp, header_color, LABEL(N_("Initial commit on ")));
if (!strcmp(s->branch, "HEAD")) {
color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
- _("HEAD (no branch)"));
+ LABEL(N_("HEAD (no branch)")));
goto conclude;
}
@@ -1760,8 +1762,6 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
if (!upstream_is_gone && !num_ours && !num_theirs)
goto conclude;
-#define LABEL(string) (s->no_gettext ? (string) : _(string))
-
color_fprintf(s->fp, header_color, " [");
if (upstream_is_gone) {
color_fprintf(s->fp, header_color, LABEL(N_("gone")));