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

Merge branch 'mg/status-porcelain-no-i18n'

Browse Source 
"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
This commit is contained in:
Junio C Hamano 2017-03-17 13:50:27 -07:00
commit 58e97730d9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wt-status.c
View File

@ -1730,12 +1730,14 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
return; return;
branch_name = s->branch; branch_name = s->branch;
#define LABEL(string) (s->no_gettext ? (string) : _(string))
if (s->is_initial) 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")) { if (!strcmp(s->branch, "HEAD")) {
color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s", color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
_("HEAD (no branch)")); LABEL(N_("HEAD (no branch)")));
goto conclude; goto conclude;
} }
@ -1760,8 +1762,6 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
if (!upstream_is_gone && !num_ours && !num_theirs) if (!upstream_is_gone && !num_ours && !num_theirs)
goto conclude; goto conclude;
#define LABEL(string) (s->no_gettext ? (string) : _(string))
color_fprintf(s->fp, header_color, " ["); color_fprintf(s->fp, header_color, " [");
if (upstream_is_gone) { if (upstream_is_gone) {
color_fprintf(s->fp, header_color, LABEL(N_("gone"))); color_fprintf(s->fp, header_color, LABEL(N_("gone")));