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 v2 07/10] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
Date: Thu, 8 Oct 2015 14:48:02 +0530 [thread overview]
Message-ID: <1444295885-1657-8-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1444295885-1657-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 38e4424..6a38089 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1118,8 +1118,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 = "[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 6fc569e..4f620bf 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-08 9:20 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-08 9:17 [PATCH v2 00/10] port branch.c to use ref-filter's printing options Karthik Nayak
2015-10-08 9:17 ` [PATCH v2 01/10] ref-filter: implement %(if), %(then), and %(else) atoms Karthik Nayak
2015-10-08 18:48 ` Matthieu Moy
2015-10-10 16:22 ` Karthik Nayak
2015-10-08 19:19 ` Matthieu Moy
2015-10-10 17:12 ` Karthik Nayak
2015-10-08 9:17 ` [PATCH v2 02/10] ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>) Karthik Nayak
2015-10-08 18:51 ` Matthieu Moy
2015-10-10 17:22 ` Karthik Nayak
2015-10-08 9:17 ` [PATCH v2 03/10] ref-filter: add support for %(refname:dir) and %(refname:base) Karthik Nayak
2015-10-08 9:17 ` [PATCH v2 04/10] ref-filter: modify "%(objectname:short)" to take length Karthik Nayak
2015-10-08 18:58 ` Matthieu Moy
2015-10-10 18:15 ` Karthik Nayak
2015-10-11 16:05 ` Matthieu Moy
2015-10-11 17:44 ` Karthik Nayak
2015-10-08 9:18 ` [PATCH v2 05/10] ref-filter: adopt get_head_description() from branch.c Karthik Nayak
2015-10-08 19:01 ` Matthieu Moy
2015-10-10 18:17 ` Karthik Nayak
2015-10-08 9:18 ` [PATCH v2 06/10] ref-filter: introduce format_ref_array_item() Karthik Nayak
2015-10-08 9:18 ` Karthik Nayak [this message]
2015-10-08 18:40 ` [PATCH v2 07/10] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams Matthieu Moy
2015-10-10 18:19 ` Karthik Nayak
2015-10-11 16:12 ` Matthieu Moy
2015-10-11 16:16 ` [PATCH 1/3] fixup: use xstrfmt instead of fixed-size buf + sprintf + xstrdup Matthieu Moy
2015-10-11 16:16 ` [PATCH 2/3] ref-filter: allow porcelain to translate messages in the output Matthieu Moy
2015-10-11 19:25 ` Karthik Nayak
2015-10-11 16:16 ` [PATCH 3/3] branch, tag: use porcelain output Matthieu Moy
2015-10-12 17:45 ` [PATCH 1/3] fixup: use xstrfmt instead of fixed-size buf + sprintf + xstrdup Junio C Hamano
2015-10-12 18:01 ` Karthik Nayak
2015-10-11 17:46 ` [PATCH v2 07/10] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams Karthik Nayak
2015-10-11 18:10 ` Matthieu Moy
2015-10-11 19:38 ` Karthik Nayak
2015-10-08 9:18 ` [PATCH v2 08/10] ref-filter: add support for %(upstream:track,nobracket) Karthik Nayak
2015-10-08 19:17 ` Matthieu Moy
2015-10-08 19:19 ` Matthieu Moy
2015-10-13 18:13 ` Karthik Nayak
2015-10-13 18:54 ` Matthieu Moy
2015-10-13 19:09 ` Junio C Hamano
2015-10-14 6:12 ` Karthik Nayak
2015-10-08 9:18 ` [PATCH v2 09/10] branch: use ref-filter printing APIs Karthik Nayak
2015-10-13 16:31 ` Junio C Hamano
2015-10-13 17:43 ` Karthik Nayak
2015-10-08 9:18 ` [PATCH v2 10/10] branch: implement '--format' option Karthik Nayak
2015-10-08 12:27 ` [PATCH v2 00/10] port branch.c to use ref-filter's printing options Matthieu Moy
2015-10-08 13:17 ` Karthik Nayak
2015-10-08 16:09 ` Karthik Nayak
2015-10-08 17:10 ` Matthieu Moy
2015-10-08 17:28 ` Karthik Nayak
2015-10-08 18:26 ` Matthieu Moy
2015-10-08 18:35 ` Junio C Hamano
2015-10-09 8:22 ` Matthieu Moy
2015-10-09 18:29 ` Junio C Hamano
2015-10-11 12:48 ` Karthik Nayak
2015-10-11 16:21 ` Matthieu Moy
2015-10-11 18:38 ` Karthik Nayak
2015-10-11 19:32 ` Matthieu Moy
2015-10-11 19:38 ` Karthik Nayak
2015-10-12 0:36 ` Junio C Hamano
2015-10-12 17:48 ` Karthik Nayak
2015-10-12 18:17 ` Matthieu Moy
2015-10-12 18:59 ` Junio C Hamano
2015-10-12 19:07 ` Matthieu Moy
2015-10-18 19:07 ` Karthik Nayak
2015-10-19 4:44 ` Junio C Hamano
2015-10-19 8:12 ` Matthieu Moy
2015-10-20 20:53 ` 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=1444295885-1657-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).