It may not be obvious from its name that wt_status_print_updated() that
it also sets wt_status.commitable, which affects commit functionality.
Extract this out into a separate function for improved clarity, though
at the expense of executing another loop.
Signed-off-by: Tay Ray Chuan <rcta...@gmail.com>
---
Changed since v1
- move call to _mark_committable() to match original control-flow
Originally, our placement of the call perhaps befitted aesthetics /
logical grouping. But perhaps it is a better idea to match the original
control flow to dispel any suspicion that this patch changed behaviour
unintendedly.
wt-status.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/wt-status.c b/wt-status.c
index c56c78f..87550ae 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -626,6 +626,21 @@ void wt_status_collect(struct wt_status *s)
wt_status_collect_untracked(s);
}
+void wt_status_mark_commitable(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->index_status ||
+ d->index_status == DIFF_STATUS_UNMERGED)
+ continue;
+ s->commitable = 1;
+ break;
+ }
+}
+
static void wt_status_print_unmerged(struct wt_status *s)
{
int shown_header = 0;
@@ -664,7 +679,6 @@ static void wt_status_print_updated(struct wt_status *s)
continue;
if (!shown_header) {
wt_status_print_cached_header(s);
- s->commitable = 1;
shown_header = 1;
}
wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
@@ -1360,6 +1374,7 @@ void wt_status_print(struct wt_status *s)
wt_status_print_updated(s);
wt_status_print_unmerged(s);
+ wt_status_mark_commitable(s);
wt_status_print_changed(s);
if (s->submodule_summary &&
(!s->ignore_submodule_arg ||
--
2.0.0.581.g64f2558
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
