From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: jacob.keller@gmail.com, gitster@pobox.com, peff@peff.net,
Karthik Nayak <Karthik.188@gmail.com>
Subject: [PATCH v5 08/16] ref-filter: make "%(symref)" atom work with the ':short' modifier
Date: Sat, 23 Apr 2016 00:33:59 +0530 [thread overview]
Message-ID: <1461351847-22903-9-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1461351847-22903-1-git-send-email-Karthik.188@gmail.com>
The "%(symref)" atom doesn't work when used with the ':short' modifier
because we strictly match only 'symref' for setting the 'need_symref'
indicator. Fix this by using comparing with valid_atom rather than used_atom.
Add tests for %(symref) and %(symref:short) while we're here.
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
---
ref-filter.c | 2 +-
t/t6300-for-each-ref.sh | 24 ++++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/ref-filter.c b/ref-filter.c
index b898bcd..083cc27 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -338,7 +338,7 @@ int parse_ref_filter_atom(const char *atom, const char *ep)
valid_atom[i].parser(&used_atom[at], arg);
if (*atom == '*')
need_tagged = 1;
- if (!strcmp(used_atom[at].name, "symref"))
+ if (!strcmp(valid_atom[i].name, "symref"))
need_symref = 1;
return at;
}
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 2c5f177..b06ea1c 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -38,6 +38,7 @@ test_atom() {
case "$1" in
head) ref=refs/heads/master ;;
tag) ref=refs/tags/testtag ;;
+ sym) ref=refs/heads/sym ;;
*) ref=$1 ;;
esac
printf '%s\n' "$3" >expected
@@ -565,4 +566,27 @@ test_expect_success 'Verify sort with multiple keys' '
refs/tags/bogo refs/tags/master > actual &&
test_cmp expected actual
'
+
+test_expect_success 'Add symbolic ref for the following tests' '
+ git symbolic-ref refs/heads/sym refs/heads/master
+'
+
+cat >expected <<EOF
+refs/heads/master
+EOF
+
+test_expect_success 'Verify usage of %(symref) atom' '
+ git for-each-ref --format="%(symref)" refs/heads/sym > actual &&
+ test_cmp expected actual
+'
+
+cat >expected <<EOF
+heads/master
+EOF
+
+test_expect_success 'Verify usage of %(symref:short) atom' '
+ git for-each-ref --format="%(symref:short)" refs/heads/sym > actual &&
+ test_cmp expected actual
+'
+
test_done
--
2.8.0
next prev parent reply other threads:[~2016-04-22 19:05 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-22 19:03 [PATCH v5 00/16] port branch.c to use ref-filter's printing options Karthik Nayak
2016-04-22 19:03 ` [PATCH v5 01/16] ref-filter: include reference to 'used_atom' within 'atom_value' Karthik Nayak
2016-04-22 19:03 ` [PATCH v5 02/16] ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>) Karthik Nayak
2016-04-22 19:03 ` [PATCH v5 03/16] ref-filter: modify "%(objectname:short)" to take length Karthik Nayak
2016-04-22 19:03 ` [PATCH v5 04/16] ref-filter: move get_head_description() from branch.c Karthik Nayak
2016-04-22 19:03 ` [PATCH v5 05/16] ref-filter: introduce format_ref_array_item() Karthik Nayak
2016-04-22 19:03 ` [PATCH v5 06/16] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams Karthik Nayak
2016-04-22 19:03 ` [PATCH v5 07/16] ref-filter: add support for %(upstream:track,nobracket) Karthik Nayak
2016-04-22 19:03 ` Karthik Nayak [this message]
2016-04-22 19:04 ` [PATCH v5 09/16] ref-filter: introduce refname_atom_parser_internal() Karthik Nayak
2016-04-22 19:04 ` [PATCH v5 10/16] ref-filter: introduce symref_atom_parser() and refname_atom_parser() Karthik Nayak
2016-04-22 19:04 ` [PATCH v5 11/16] ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal() Karthik Nayak
2016-04-22 19:04 ` [PATCH v5 12/16] ref-filter: add `:dir` and `:base` options for ref printing atoms Karthik Nayak
2016-04-22 19:04 ` [PATCH v5 13/16] ref-filter: allow porcelain to translate messages in the output Karthik Nayak
2016-04-22 19:04 ` [PATCH v5 14/16] branch, tag: use porcelain output Karthik Nayak
2016-04-22 19:04 ` [PATCH v5 15/16] branch: use ref-filter printing APIs Karthik Nayak
2016-04-22 19:04 ` [PATCH v5 16/16] 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
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=1461351847-22903-9-git-send-email-Karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=peff@peff.net \
/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).