diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-08 18:37:26 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-08 18:37:26 +0300 |
| commit | f560a4d1598106258f43d0d5cc04cae3e6aa93e2 (patch) | |
| tree | 52a0af13c3083c2418dcfc46a2e970f117e25aaa /wt-status.c | |
| parent | 70542df56618f2766064384f7741c7e25bac1cfd (diff) | |
| parent | c646d0934ec2056d816ad1ecc23f6620aba2c6da (diff) | |
Merge branch 'dr/ref-filter-push-track-fix'
%(push:track) token used in the --format option to "git
for-each-ref" and friends was not showing the right branch, which
has been fixed.
* dr/ref-filter-push-track-fix:
ref-filter: use correct branch for %(push:track)
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wt-status.c b/wt-status.c index b81fcd428d..f4fa982638 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1857,7 +1857,7 @@ static void wt_shortstatus_print_tracking(struct wt_status *s) color_fprintf(s->fp, branch_color_local, "%s", branch_name); sti = stat_tracking_info(branch, &num_ours, &num_theirs, &base, - s->ahead_behind_flags); + 0, s->ahead_behind_flags); if (sti < 0) { if (!base) goto conclude; @@ -1996,7 +1996,7 @@ static void wt_porcelain_v2_print_tracking(struct wt_status *s) branch = branch_get(branch_name); base = NULL; ab_info = stat_tracking_info(branch, &nr_ahead, &nr_behind, - &base, s->ahead_behind_flags); + &base, 0, s->ahead_behind_flags); if (base) { base = shorten_unambiguous_ref(base, 0); fprintf(s->fp, "# branch.upstream %s%c", base, eol); |