From c01d8f94591679fd55b0f899e6fc24555c11485a Mon Sep 17 00:00:00 2001 From: "Stephen P. Smith" Date: Wed, 5 Sep 2018 17:53:26 -0700 Subject: [PATCH] wt-status.c: move has_unmerged earlier in the file 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 Signed-off-by: Junio C Hamano --- wt-status.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/wt-status.c b/wt-status.c index 5ffab61015..180faf6ba7 100644 --- a/wt-status.c +++ b/wt-status.c @@ -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)