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>

diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index d7ab4c9611760fe4059a7f58c2b09daf42a1c34d..94c6b88faa971ab97478a8b78b3cd00a2be4a1fd 100644 (file)
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -121,7 +121,8 @@ upstream::
        "[ahead N, behind M]" and `:trackshort` to show the terse
        version: ">" (ahead), "<" (behind), "<>" (ahead and behind),
        or "=" (in sync).  Has no effect if the ref does not have
        "[ahead N, behind M]" and `:trackshort` to show the terse
        version: ">" (ahead), "<" (behind), "<>" (ahead and behind),
        or "=" (in sync).  Has no effect if the ref does not have

-       tracking information associated with it.
+       tracking information associated with it. `:track` also prints
+       "[gone]" whenever unknown upstream ref is encountered.

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

diff --git a/ref-filter.c b/ref-filter.c
index 92c2d4fe70794501c5c112e4c0008a4583d22370..4a05150578d71fc68d0335a41719fe738df2fca9 100644 (file)
--- 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,
                *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;
                        return;

+               }

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

diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index e67c694c35a2a5ed9cc77fb02d6d03d3eaa42f57..a2e3f5525ffd3f76691e3eba29dbd50185e2af0c 100755 (executable)
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -382,7 +382,7 @@ test_expect_success 'Check that :track[short] cannot be used with other atoms' '
 
 test_expect_success 'Check that :track[short] works when upstream is invalid' '
        cat >expected <<-\EOF &&
 
 test_expect_success 'Check that :track[short] works when upstream is invalid' '
        cat >expected <<-\EOF &&

-
+       [gone]

 
        EOF
        test_when_finished "git config branch.master.merge refs/heads/master" &&
 
        EOF
        test_when_finished "git config branch.master.merge refs/heads/master" &&