Skip to content

Commit ffd921d

Browse files
KarthikNayakgitster
authored andcommitted
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>
1 parent 99c6a71 commit ffd921d

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

Documentation/git-for-each-ref.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ upstream::
121121
"[ahead N, behind M]" and `:trackshort` to show the terse
122122
version: ">" (ahead), "<" (behind), "<>" (ahead and behind),
123123
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.
125126

126127
push::
127128
The name of a local ref which represents the `@{push}` location

ref-filter.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1073,8 +1073,10 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname,
10731073
*s = shorten_unambiguous_ref(refname, warn_ambiguous_refs);
10741074
else if (atom->u.remote_ref == RR_TRACK) {
10751075
if (stat_tracking_info(branch, &num_ours,
1076-
&num_theirs, NULL))
1076+
&num_theirs, NULL)) {
1077+
*s = "[gone]";
10771078
return;
1079+
}
10781080

10791081
if (!num_ours && !num_theirs)
10801082
*s = "";

t/t6300-for-each-ref.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ test_expect_success 'Check that :track[short] cannot be used with other atoms' '
382382

383383
test_expect_success 'Check that :track[short] works when upstream is invalid' '
384384
cat >expected <<-\EOF &&
385-
385+
[gone]
386386
387387
EOF
388388
test_when_finished "git config branch.master.merge refs/heads/master" &&

0 commit comments

Comments
 (0)