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

Merge branch 'rs/wt-status-cleanup'

Browse Source 
Code cleanup.

* rs/wt-status-cleanup:
  wt-status: use separate variable for result of shorten_unambiguous_ref
This commit is contained in:
Junio C Hamano 2017-07-12 15:18:23 -07:00
commit 094aa09aa5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wt-status.c
View File

@ -1763,6 +1763,7 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s); const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
const char *base; const char *base;
char *short_base;
const char *branch_name; const char *branch_name;
int num_ours, num_theirs; int num_ours, num_theirs;
int upstream_is_gone = 0; int upstream_is_gone = 0;
@ -1797,10 +1798,10 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
upstream_is_gone = 1; upstream_is_gone = 1;
} }
base = shorten_unambiguous_ref(base, 0); short_base = shorten_unambiguous_ref(base, 0);
color_fprintf(s->fp, header_color, "..."); color_fprintf(s->fp, header_color, "...");
color_fprintf(s->fp, branch_color_remote, "%s", base); color_fprintf(s->fp, branch_color_remote, "%s", short_base);
free((char *)base); free(short_base);
if (!upstream_is_gone && !num_ours && !num_theirs) if (!upstream_is_gone && !num_ours && !num_theirs)
goto conclude; goto conclude;