From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: jacob.keller@gmail.com, gitster@pobox.com, jnareb@gmail.com,
Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH v8 07/19] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
Date: Wed, 7 Dec 2016 21:06:15 +0530 [thread overview]
Message-ID: <20161207153627.1468-8-Karthik.188@gmail.com> (raw)
In-Reply-To: <20161207153627.1468-1-Karthik.188@gmail.com>
From: Karthik Nayak <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 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>
---
Documentation/git-for-each-ref.txt | 3 ++-
ref-filter.c | 4 +++-
t/t6300-for-each-ref.sh | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index b730735..536846f 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -118,7 +118,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
- 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
diff --git a/ref-filter.c b/ref-filter.c
index 0f81f9f..e0229d3 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1053,8 +1053,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 644f169..5019f40 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.10.2
next prev parent reply other threads:[~2016-12-07 15:37 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-07 15:36 [PATCH v8 00/19] port branch.c to use ref-filter's printing options Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 01/19] ref-filter: implement %(if), %(then), and %(else) atoms Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 02/19] ref-filter: include reference to 'used_atom' within 'atom_value' Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 03/19] ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>) Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 04/19] ref-filter: modify "%(objectname:short)" to take length Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 05/19] ref-filter: move get_head_description() from branch.c Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 06/19] ref-filter: introduce format_ref_array_item() Karthik Nayak
2016-12-07 15:36 ` Karthik Nayak [this message]
2016-12-07 15:36 ` [PATCH v8 08/19] ref-filter: add support for %(upstream:track,nobracket) Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 09/19] ref-filter: make "%(symref)" atom work with the ':short' modifier Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 10/19] ref-filter: introduce refname_atom_parser_internal() Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 11/19] ref-filter: introduce refname_atom_parser() Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 12/19] ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal() Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 13/19] ref-filter: rename the 'strip' option to 'lstrip' Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 14/19] ref-filter: modify the 'lstrip=<N>' option to work with negative '<N>' Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 15/19] ref-filter: add an 'rstrip=<N>' option to atoms which deal with refnames Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 16/19] ref-filter: allow porcelain to translate messages in the output Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 17/19] branch, tag: use porcelain output Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 18/19] branch: use ref-filter printing APIs Karthik Nayak
2016-12-09 14:03 ` Jeff King
2016-12-12 11:20 ` Karthik Nayak
2016-12-12 12:15 ` Jeff King
2016-12-12 16:29 ` Karthik Nayak
2016-12-12 16:40 ` Jeff King
2016-12-12 17:18 ` Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 19/19] branch: implement '--format' option Karthik Nayak
2016-12-08 0:01 ` [PATCH v8 00/19] port branch.c to use ref-filter's printing options Jacob Keller
2016-12-08 18:58 ` Junio C Hamano
2016-12-09 1:45 ` Jacob Keller
2016-12-12 10:42 ` Karthik Nayak
2016-12-08 23:58 ` Junio C Hamano
2016-12-12 10:43 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161207153627.1468-8-Karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=jnareb@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).