Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'wt-status.c')
-rw-r--r--wt-status.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/wt-status.c b/wt-status.c
index ef26f07446..1137f27aa6 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1796,7 +1796,8 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
color_fprintf(s->fp, branch_color_local, "%s", branch_name);
- if (stat_tracking_info(branch, &num_ours, &num_theirs, &base) < 0) {
+ if (stat_tracking_info(branch, &num_ours, &num_theirs, &base,
+ AHEAD_BEHIND_FULL) < 0) {
if (!base)
goto conclude;
@@ -1933,7 +1934,8 @@ static void wt_porcelain_v2_print_tracking(struct wt_status *s)
/* Lookup stats on the upstream tracking branch, if set. */
branch = branch_get(branch_name);
base = NULL;
- ab_info = (stat_tracking_info(branch, &nr_ahead, &nr_behind, &base) == 0);
+ ab_info = (stat_tracking_info(branch, &nr_ahead, &nr_behind,
+ &base, AHEAD_BEHIND_FULL) >= 0);
if (base) {
base = shorten_unambiguous_ref(base, 0);
fprintf(s->fp, "# branch.upstream %s%c", base, eol);