diff options
| author | Karthik Nayak <karthik.188@gmail.com> | 2017-01-10 08:49:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-10 20:44:31 (GMT) |
| commit | ffd921d311c9293ce83e0d191769a962d9197a71 (patch) | |
| tree | 25f0b7f69d5314551ab63275f612f00a0f740644 /ref-filter.c | |
| parent | 99c6a71d4f7f4197f5e8600b0edec2a6a9fd9988 (diff) | |
| download | git-ffd921d311c9293ce83e0d191769a962d9197a71.zip git-ffd921d311c9293ce83e0d191769a962d9197a71.tar.gz git-ffd921d311c9293ce83e0d191769a962d9197a71.tar.bz2 | |
ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
Borrowing from branch.c's implementation print "[gone]" whenever an
unknown upstream ref is encountered instead of just ignoring it.
This makes sure that when branch.c is ported over to using ref-filter
APIs for printing, this feature is not lost.
Make changes to t/t6300-for-each-ref.sh and
Documentation/git-for-each-ref.txt to reflect this change.
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Helped-by : Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ref-filter.c')
| -rw-r--r-- | ref-filter.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ref-filter.c b/ref-filter.c index 92c2d4f..4a05150 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1073,8 +1073,10 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname, *s = shorten_unambiguous_ref(refname, warn_ambiguous_refs); else if (atom->u.remote_ref == RR_TRACK) { if (stat_tracking_info(branch, &num_ours, - &num_theirs, NULL)) + &num_theirs, NULL)) { + *s = "[gone]"; return; + } if (!num_ours && !num_theirs) *s = ""; |