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>
Stephen P. Smith committed
Sep 5, 2018 at 17:53 UTC
c01d8f94591679fd55b0f899e6fc24555c11485a
1 file changed
+13
-13
wt-status.c
+13
-13
@@ -724,6 +724,19 @@ static void wt_status_collect_untracked(struct wt_status *s)
724
s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
725
}
726
727
+static int has_unmerged(struct wt_status *s)
728
+{
729
+ int i;
730
+
731
+ for (i = 0; i < s->change.nr; i++) {
732
+ struct wt_status_change_data *d;
733
+ d = s->change.items[i].util;
734
+ if (d->stagemask)
735
+ return 1;
736
+ }
737
+ return 0;
738
+}
739
+
740
void wt_status_collect(struct wt_status *s)
741
{
742
wt_status_collect_changes_worktree(s);
@@ -1063,19 +1076,6 @@ static void wt_longstatus_print_tracking(struct wt_status *s)
1076
strbuf_release(&sb);
1077
}
1078
1066
-static int has_unmerged(struct wt_status *s)
1067
-{
1068
- int i;
1069
-
1070
- for (i = 0; i < s->change.nr; i++) {
1071
- struct wt_status_change_data *d;
1072
- d = s->change.items[i].util;
1073
- if (d->stagemask)
1074
- return 1;
1075
- }
1076
- return 0;
1077
-}
1078
-
1079
static void show_merge_in_progress(struct wt_status *s,
1080
struct wt_status_state *state,
1081
const char *color)