diff options
| author |  Damien Robert <damien.olivier.robert+git@gmail.com> | 2019-04-16 14:16:46 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-04-18 09:17:41 +0900 |
| commit | c646d0934ec2056d816ad1ecc23f6620aba2c6da (patch) | |
| tree | f1ceb4ff5a2864487bfaa35e35a3173d0a267ca3 /wt-status.c | |
| parent | mingw: allow building with an MSYS2 runtime v3.x (diff) | |
| download | tgif-c646d0934ec2056d816ad1ecc23f6620aba2c6da.tar.xz | |
ref-filter: use correct branch for %(push:track)
In ref-filter.c, when processing the atom %(push:track), the
ahead/behind values are computed using `stat_tracking_info` which refers
to the upstream branch.
Fix that by introducing a new flag `for_push` in `stat_tracking_info`
in remote.c, which does the same thing but for the push branch.
Update the few callers of `stat_tracking_info` to handle this flag. This
ensure that whenever we use this function in the future, we are careful
to specify is this should apply to the upstream or the push branch.
This bug was not detected in t/t6300-for-each-ref.sh because in the test
for push:track, both the upstream and the push branches were behind by 1
from the local branch. Change the test so that the upstream branch is
behind by 1 while the push branch is ahead by 1. This allows us to test
that %(push:track) refers to the correct branch.
This changes the expected value of some following tests (by introducing
new references), so update them too.
Signed-off-by: Damien Robert <damien.olivier.robert+git@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 1f564b12d2..dcd9c005b9 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1840,7 +1840,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; @@ -1979,7 +1979,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); |