development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-02 15:48:44 +00:00
Code Issues Projects Releases Wiki Activity

wt-status.c: move has_unmerged earlier in the file

Browse Source 
Move has_unmerged() up in the file so that it can be called in
wt_status_collect() where we need to place a merge check.

Signed-off-by: Stephen P. Smith <ischis2@cox.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stephen P. Smith 2018-09-05 17:53:26 -07:00 committed by Junio C Hamano
parent c05048d439
commit c01d8f9459
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
wt-status.c
View File

@ -724,6 +724,19 @@ static void wt_status_collect_untracked(struct wt_status *s)
s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
}
static int has_unmerged(struct wt_status *s)
{
int i;
for (i = 0; i < s->change.nr; i++) {
struct wt_status_change_data *d;
d = s->change.items[i].util;
if (d->stagemask)
return 1;
}
return 0;
}
void wt_status_collect(struct wt_status *s)
{
wt_status_collect_changes_worktree(s);
@ -1063,19 +1076,6 @@ static void wt_longstatus_print_tracking(struct wt_status *s)
strbuf_release(&sb);
}
static int has_unmerged(struct wt_status *s)
{
int i;
for (i = 0; i < s->change.nr; i++) {
struct wt_status_change_data *d;
d = s->change.items[i].util;
if (d->stagemask)
return 1;
}
return 0;
}
static void show_merge_in_progress(struct wt_status *s,
struct wt_status_state *state,
const char *color)