From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr,
gitster@pobox.com, Karthik Nayak <Karthik.188@gmail.com>,
Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH 7/9] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
Date: Fri, 2 Oct 2015 23:09:04 +0530 [thread overview]
Message-ID: <1443807546-5985-8-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1443807546-5985-1-git-send-email-Karthik.188@gmail.com>
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 to reflect this change.
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
---
ref-filter.c | 4 +++-
t/t6300-for-each-ref.sh | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index 099acd6..48b06e3 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1133,8 +1133,10 @@ static void populate_value(struct ref_array_item *ref)
char buf[40];
if (stat_tracking_info(branch, &num_ours,
- &num_theirs, NULL))
+ &num_theirs, NULL)) {
+ v->s = xstrdup("[gone]");
continue;
+ }
if (!num_ours && !num_theirs)
v->s = "";
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 7f675d2..2a01645 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -359,7 +359,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 &&
-
+ [gone]
EOF
test_when_finished "git config branch.master.merge refs/heads/master" &&
--
2.6.0
next prev parent reply other threads:[~2015-10-02 17:39 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-02 17:38 [PATCH 0/9] port branch.c to use ref-filter printing APIs Karthik Nayak
2015-10-02 17:38 ` [PATCH 1/9] ref-filter: implement %(if), %(then), and %(else) atoms Karthik Nayak
2015-10-02 20:45 ` Junio C Hamano
2015-10-03 7:05 ` Karthik Nayak
2015-10-03 9:39 ` Matthieu Moy
2015-10-03 17:01 ` Junio C Hamano
2015-10-04 8:02 ` Matthieu Moy
2015-10-04 17:21 ` Junio C Hamano
2015-10-04 13:59 ` Karthik Nayak
2015-10-02 17:38 ` [PATCH 2/9] ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>) Karthik Nayak
2015-10-02 20:54 ` Junio C Hamano
2015-10-03 7:14 ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 3/9] ref-filter: add support for %(path) atom Karthik Nayak
2015-10-03 10:02 ` Matthieu Moy
2015-10-04 17:07 ` Karthik Nayak
2015-10-04 17:51 ` Matthieu Moy
2015-10-04 18:44 ` Junio C Hamano
2015-10-05 6:40 ` Matthieu Moy
2015-10-04 19:12 ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 4/9] ref-filter: modify "%(objectname:short)" to take length Karthik Nayak
2015-10-02 21:02 ` Junio C Hamano
2015-10-03 7:28 ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 5/9] ref-filter: adopt get_head_description() from branch.c Karthik Nayak
2015-10-02 17:39 ` [PATCH 6/9] ref-filter: introduce format_ref_array_item() Karthik Nayak
2015-10-03 12:02 ` Matthieu Moy
2015-10-05 7:49 ` Karthik Nayak
2015-10-05 8:49 ` Matthieu Moy
2015-10-06 19:16 ` Karthik Nayak
2015-10-06 19:38 ` Matthieu Moy
2015-10-06 19:50 ` Karthik Nayak
2015-10-02 17:39 ` Karthik Nayak [this message]
2015-10-03 12:08 ` [PATCH 7/9] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams Matthieu Moy
2015-10-05 7:49 ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 8/9] branch: use ref-filter printing APIs Karthik Nayak
2015-10-03 12:41 ` Matthieu Moy
2015-10-05 17:46 ` Karthik Nayak
2015-10-05 18:43 ` Matthieu Moy
2015-10-06 15:30 ` Karthik Nayak
2015-10-06 19:03 ` Matthieu Moy
2015-10-07 16:47 ` Karthik Nayak
2015-10-07 17:58 ` Matthieu Moy
2015-10-07 18:02 ` Karthik Nayak
2015-10-02 17:39 ` [PATCH 9/9] branch: implement '--format' option Karthik Nayak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1443807546-5985-8-git-send-email-Karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).