diff options
| author | Stephen P. Smith <ischis2@cox.net> | 2018-09-06 00:53:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-07 21:36:32 (GMT) |
| commit | c01d8f94591679fd55b0f899e6fc24555c11485a (patch) | |
| tree | 79597bcb0acb5b54aefebf6a0282039abe738482 /wt-status.c | |
| parent | c05048d43925ab8edcb36663752c2b4541911231 (diff) | |
| download | git-c01d8f94591679fd55b0f899e6fc24555c11485a.zip git-c01d8f94591679fd55b0f899e6fc24555c11485a.tar.gz git-c01d8f94591679fd55b0f899e6fc24555c11485a.tar.bz2 | |
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 <ischis2@cox.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/wt-status.c b/wt-status.c index 5ffab61..180faf6 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) |