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>
Karthik Nayak committed
Jan 10, 2017 at 14:19 UTC
ffd921d311c9293ce83e0d191769a962d9197a71
3 files changed
+6
-3
Documentation/git-for-each-ref.txt
+2
-1
@@ -121,7 +121,8 @@ upstream::
121
"[ahead N, behind M]" and `:trackshort` to show the terse
122
version: ">" (ahead), "<" (behind), "<>" (ahead and behind),
123
or "=" (in sync). Has no effect if the ref does not have
124
- tracking information associated with it.
124
+ tracking information associated with it. `:track` also prints
125
+ "[gone]" whenever unknown upstream ref is encountered.
126
127
push::
128
The name of a local ref which represents the `@{push}` location
ref-filter.c
+3
-1
@@ -1073,8 +1073,10 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname,
1073
*s = shorten_unambiguous_ref(refname, warn_ambiguous_refs);
1074
else if (atom->u.remote_ref == RR_TRACK) {
1075
if (stat_tracking_info(branch, &num_ours,
1076
- &num_theirs, NULL))
1076
+ &num_theirs, NULL)) {
1077
+ *s = "[gone]";
1078
return;
1079
+ }
1080
1081
if (!num_ours && !num_theirs)
1082
*s = "";
t/t6300-for-each-ref.sh
+1
-1
@@ -382,7 +382,7 @@ test_expect_success 'Check that :track[short] cannot be used with other atoms' '
382
383
test_expect_success 'Check that :track[short] works when upstream is invalid' '
384
cat >expected <<-\EOF &&
385
-
385
+ [gone]
386
387
EOF
388
test_when_finished "git config branch.master.merge refs/heads/master" &&