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 /ref-filter.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 'ref-filter.c')
| -rw-r--r-- | ref-filter.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ref-filter.c b/ref-filter.c index 8d11a94cbd..8500671bc6 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1392,7 +1392,8 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname, *s = show_ref(&atom->u.remote_ref.refname, refname); else if (atom->u.remote_ref.option == RR_TRACK) { if (stat_tracking_info(branch, &num_ours, &num_theirs, - NULL, AHEAD_BEHIND_FULL) < 0) { + NULL, atom->u.remote_ref.push, + AHEAD_BEHIND_FULL) < 0) { *s = xstrdup(msgs.gone); } else if (!num_ours && !num_theirs) *s = xstrdup(""); @@ -1410,7 +1411,8 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname, } } else if (atom->u.remote_ref.option == RR_TRACKSHORT) { if (stat_tracking_info(branch, &num_ours, &num_theirs, - NULL, AHEAD_BEHIND_FULL) < 0) { + NULL, atom->u.remote_ref.push, + AHEAD_BEHIND_FULL) < 0) { *s = xstrdup(""); return; } |