From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Karthik Nayak <Karthik.188@gmail.com>,
Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH 06/15] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
Date: Sun, 6 Mar 2016 17:34:53 +0530 [thread overview]
Message-ID: <1457265902-7949-7-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1457265902-7949-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 2896cde..c8ba68f 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1039,8 +1039,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,
- &num_theirs, NULL))
+ &num_theirs, NULL)) {
+ *s = "[gone]";
return;
+ }
if (!num_ours && !num_theirs)
*s = "";
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 2be0a3f..a92b36f 100755
--- 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 &&
-
+ [gone]
EOF
test_when_finished "git config branch.master.merge refs/heads/master" &&
--
2.7.2
next prev parent reply other threads:[~2016-03-06 12:05 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-06 12:04 [PATCH 00/15] port branch.c to use ref-filter's printing options Karthik Nayak
2016-03-06 12:04 ` [PATCH 01/15] ref-filter: implement %(if), %(then), and %(else) atoms Karthik Nayak
2016-03-06 12:04 ` [PATCH 02/15] ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>) Karthik Nayak
2016-03-07 22:49 ` Junio C Hamano
2016-03-08 5:41 ` Karthik Nayak
2016-03-08 6:04 ` Junio C Hamano
2016-03-08 6:09 ` Karthik Nayak
2016-03-06 12:04 ` [PATCH 03/15] ref-filter: modify "%(objectname:short)" to take length Karthik Nayak
2016-03-06 12:04 ` [PATCH 04/15] ref-filter: move get_head_description() from branch.c Karthik Nayak
2016-03-06 12:04 ` [PATCH 05/15] ref-filter: introduce format_ref_array_item() Karthik Nayak
2016-03-06 12:04 ` Karthik Nayak [this message]
2016-03-08 1:55 ` [PATCH 06/15] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams Jacob Keller
2016-03-08 6:10 ` Karthik Nayak
2016-03-06 12:04 ` [PATCH 07/15] ref-filter: add support for %(upstream:track,nobracket) Karthik Nayak
2016-03-06 12:04 ` [PATCH 08/15] ref-filter: make "%(symref)" atom work with the ':short' modifier Karthik Nayak
2016-03-07 23:08 ` Junio C Hamano
2016-03-08 1:56 ` Jacob Keller
2016-03-08 6:21 ` Karthik Nayak
2016-03-08 20:19 ` Junio C Hamano
2016-03-09 11:17 ` Karthik Nayak
2016-03-06 12:04 ` [PATCH 09/15] ref-filter: introduce symref_atom_parser() Karthik Nayak
2016-03-06 12:04 ` [PATCH 10/15] ref-filter: introduce refname_atom_parser() Karthik Nayak
2016-03-06 12:04 ` [PATCH 11/15] ref-filter: add support for %(refname:dir) and %(refname:base) Karthik Nayak
2016-03-06 12:04 ` [PATCH 12/15] ref-filter: allow porcelain to translate messages in the output Karthik Nayak
2016-03-06 12:05 ` [PATCH 13/15] branch, tag: use porcelain output Karthik Nayak
2016-03-06 12:05 ` [PATCH 14/15] branch: use ref-filter printing APIs Karthik Nayak
2016-03-07 23:11 ` Junio C Hamano
2016-03-06 12:05 ` [PATCH 15/15] branch: implement '--format' option Karthik Nayak
2016-03-08 1:58 ` Jacob Keller
2016-03-15 16:38 ` 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=1457265902-7949-7-git-send-email-Karthik.188@gmail.com \
--to=karthik.188@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).