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 /remote.h | |
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 'remote.h')
-rw-r--r-- | remote.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -255,7 +255,8 @@ enum ahead_behind_flags { /* Reporting of tracking info */ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs, - const char **upstream_name, enum ahead_behind_flags abf); + const char **upstream_name, int for_push, + enum ahead_behind_flags abf); int format_tracking_info(struct branch *branch, struct strbuf *sb, enum ahead_behind_flags abf); |