diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-10 19:46:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-10 19:46:11 -0700 |
| commit | 212de7445d463405f01efe2bcae8419c8873bb56 (patch) | |
| tree | cab980ad918a36af1b88225425ca5300fb9b48ae /wt-status.c | |
| parent | b203494c42a31924f92ee1d08cd72af3c69392ba (diff) | |
| download | git-mg/status-in-progress-info.tar.gz | |
status --short --inprogress: spell it as --in-progressmg/status-in-progress-info
I think the option should be discarded and instead the new
information should be emitted unconditonally, but while I am waiting
for other people's opinion, at least we should spell the option in a
more readable way.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wt-status.c b/wt-status.c index f4606d27c8..a153dc5de0 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1739,7 +1739,7 @@ static void wt_shortstatus_print_tracking(struct wt_status *s) if (!strcmp(s->branch, "HEAD")) { color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s", LABEL(N_("HEAD (no branch)"))); - goto inprogress; + goto in_progress; } skip_prefix(branch_name, "refs/heads/", &branch_name); @@ -1750,7 +1750,7 @@ static void wt_shortstatus_print_tracking(struct wt_status *s) if (stat_tracking_info(branch, &num_ours, &num_theirs, &base) < 0) { if (!base) - goto inprogress; + goto in_progress; upstream_is_gone = 1; } @@ -1761,7 +1761,7 @@ static void wt_shortstatus_print_tracking(struct wt_status *s) free((char *)base); if (!upstream_is_gone && !num_ours && !num_theirs) - goto inprogress; + goto in_progress; color_fprintf(s->fp, header_color, " ["); if (upstream_is_gone) { @@ -1781,8 +1781,8 @@ static void wt_shortstatus_print_tracking(struct wt_status *s) color_fprintf(s->fp, header_color, "]"); - inprogress: - if (!s->show_inprogress) + in_progress: + if (!s->show_in_progress) goto conclude; memset(&state, 0, sizeof(state)); wt_status_get_state(&state, |