From: Dennis Kaarsemaker <dennis@kaarsemaker.net>
To: Karthik Nayak <karthik.188@gmail.com>, git@vger.kernel.org
Cc: gitster@pobox.com, jacob.keller@gmail.com
Subject: Re: [PATCH v3 00/16] port branch.c to use ref-filter's printing options
Date: Fri, 01 Apr 2016 15:31:17 +0200 [thread overview]
Message-ID: <1459517477.3493.5.camel@kaarsemaker.net> (raw)
In-Reply-To: <1459330800-12525-1-git-send-email-Karthik.188@gmail.com>
On wo, 2016-03-30 at 15:09 +0530, Karthik Nayak wrote:
>
> This is part of unification of the commands 'git tag -l, git branch -l
> and git for-each-ref'. This ports over branch.c to use ref-filter's
> printing options.
>
> Initially posted here: $(gmane/279226). It was decided that this series
> would follow up after refactoring ref-filter parsing mechanism, which
> is now merged into master (9606218b32344c5c756f7c29349d3845ef60b80c).
Interaction between this series and something I've not yet been able to
identify seems to break t6302. In f08f64b (the merge commit that merges
this with pu), that test fails. But neither of its parents show the
same failure.
Full log of a failing 'make && make test':
https://ci.kaarsemaker.net/git/refs/heads/pu/718c0b31e51ab07181954fb5147e3283793553f4/artefact/test/log
Verbose output of the failing test:
expecting success:
git for-each-ref --format="%(if)%(authorname)%(then)%(authorname): %(refname)%(end)" >actual &&
cat >expect <<-\EOF &&
A U Thor: refs/heads/master
A U Thor: refs/heads/side
A U Thor: refs/odd/spot
A U Thor: refs/tags/foo1.10
A U Thor: refs/tags/foo1.3
A U Thor: refs/tags/foo1.6
A U Thor: refs/tags/four
A U Thor: refs/tags/one
A U Thor: refs/tags/three
A U Thor: refs/tags/two
EOF
test_cmp expect actual
--- expect 2016-04-01 13:28:14.157855026 +0000
+++ actual 2016-04-01 13:28:14.153855026 +0000
@@ -2,6 +2,8 @@
A U Thor: refs/heads/side
A U Thor: refs/odd/spot
+
+
A U Thor: refs/tags/foo1.10
A U Thor: refs/tags/foo1.3
A U Thor: refs/tags/foo1.6
not ok 34 - check %(if)...%(then)...%(end) atoms
#
# git for-each-ref --format="%(if)%(authorname)%(then)%(authorname): %(refname)%(end)" >actual &&
# cat >expect <<-\EOF &&
# A U Thor: refs/heads/master
# A U Thor: refs/heads/side
# A U Thor: refs/odd/spot
#
# A U Thor: refs/tags/foo1.10
# A U Thor: refs/tags/foo1.3
# A U Thor: refs/tags/foo1.6
# A U Thor: refs/tags/four
# A U Thor: refs/tags/one
#
# A U Thor: refs/tags/three
# A U Thor: refs/tags/two
# EOF
# test_cmp expect actual
#
expecting success:
git for-each-ref --format="%(if)%(authorname)%(then)%(authorname)%(else)No author%(end): %(refname)" >actual &&
cat >expect <<-\EOF &&
A U Thor: refs/heads/master
A U Thor: refs/heads/side
A U Thor: refs/odd/spot
No author: refs/tags/double-tag
A U Thor: refs/tags/foo1.10
A U Thor: refs/tags/foo1.3
A U Thor: refs/tags/foo1.6
A U Thor: refs/tags/four
A U Thor: refs/tags/one
No author: refs/tags/signed-tag
A U Thor: refs/tags/three
A U Thor: refs/tags/two
EOF
test_cmp expect actual
--- expect 2016-04-01 13:28:14.161855026 +0000
+++ actual 2016-04-01 13:28:14.161855026 +0000
@@ -1,7 +1,9 @@
A U Thor: refs/heads/master
A U Thor: refs/heads/side
A U Thor: refs/odd/spot
-No author: refs/tags/double-tag
+No author: refs/tags/annotated-tag
+No author: refs/tags/doubly-annotated-tag
+No author: refs/tags/doubly-signed-tag
A U Thor: refs/tags/foo1.10
A U Thor: refs/tags/foo1.3
A U Thor: refs/tags/foo1.6
not ok 35 - check %(if)...%(then)...%(else)...%(end) atoms
#
# git for-each-ref --format="%(if)%(authorname)%(then)%(authorname)%(else)No author%(end): %(refname)" >actual &&
# cat >expect <<-\EOF &&
# A U Thor: refs/heads/master
# A U Thor: refs/heads/side
# A U Thor: refs/odd/spot
# No author: refs/tags/double-tag
# A U Thor: refs/tags/foo1.10
# A U Thor: refs/tags/foo1.3
# A U Thor: refs/tags/foo1.6
# A U Thor: refs/tags/four
# A U Thor: refs/tags/one
# No author: refs/tags/signed-tag
# A U Thor: refs/tags/three
# A U Thor: refs/tags/two
# EOF
# test_cmp expect actual
#
expecting success:
git for-each-ref --format="%(refname:short): %(if)%(HEAD)%(then)Head ref%(else)Not Head ref%(end)" >actual &&
cat >expect <<-\EOF &&
master: Head ref
side: Not Head ref
odd/spot: Not Head ref
double-tag: Not Head ref
foo1.10: Not Head ref
foo1.3: Not Head ref
foo1.6: Not Head ref
four: Not Head ref
one: Not Head ref
signed-tag: Not Head ref
three: Not Head ref
two: Not Head ref
EOF
test_cmp expect actual
--- expect 2016-04-01 13:28:14.165855026 +0000
+++ actual 2016-04-01 13:28:14.165855026 +0000
@@ -1,7 +1,9 @@
master: Head ref
side: Not Head ref
odd/spot: Not Head ref
-double-tag: Not Head ref
+annotated-tag: Not Head ref
+doubly-annotated-tag: Not Head ref
+doubly-signed-tag: Not Head ref
foo1.10: Not Head ref
foo1.3: Not Head ref
foo1.6: Not Head ref
not ok 36 - ignore spaces in %(if) atom usage
#
# git for-each-ref --format="%(refname:short): %(if)%(HEAD)%(then)Head ref%(else)Not Head ref%(end)" >actual &&
# cat >expect <<-\EOF &&
# master: Head ref
# side: Not Head ref
# odd/spot: Not Head ref
# double-tag: Not Head ref
# foo1.10: Not Head ref
# foo1.3: Not Head ref
# foo1.6: Not Head ref
# four: Not Head ref
# one: Not Head ref
# signed-tag: Not Head ref
# three: Not Head ref
# two: Not Head ref
# EOF
# test_cmp expect actual
#
# failed 3 among 38 test(s)
1..38
--
Dennis Kaarsemaker
www.kaarsemaker.net
next prev parent reply other threads:[~2016-04-01 13:31 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-30 9:39 [PATCH v3 00/16] port branch.c to use ref-filter's printing options Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 01/16] ref-filter: implement %(if), %(then), and %(else) atoms Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 02/16] ref-filter: include reference to 'used_atom' within 'atom_value' Karthik Nayak
2016-03-30 22:12 ` Junio C Hamano
2016-03-30 9:39 ` [PATCH v3 03/16] ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>) Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 04/16] ref-filter: modify "%(objectname:short)" to take length Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 05/16] ref-filter: move get_head_description() from branch.c Karthik Nayak
2016-03-30 22:16 ` Junio C Hamano
2016-04-01 18:41 ` Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 06/16] ref-filter: introduce format_ref_array_item() Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 07/16] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 08/16] ref-filter: add support for %(upstream:track,nobracket) Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 09/16] ref-filter: make "%(symref)" atom work with the ':short' modifier Karthik Nayak
2016-03-30 22:17 ` Junio C Hamano
2016-04-01 18:13 ` Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 10/16] ref-filter: introduce symref_atom_parser() Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 11/16] ref-filter: introduce refname_atom_parser() Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 12/16] ref-filter: add support for %(refname:dir) and %(refname:base) Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 13/16] ref-filter: allow porcelain to translate messages in the output Karthik Nayak
2016-03-30 21:58 ` Junio C Hamano
2016-04-01 19:00 ` Karthik Nayak
2016-04-04 8:05 ` Matthieu Moy
2016-04-04 16:12 ` Junio C Hamano
2016-03-30 9:39 ` [PATCH v3 14/16] branch, tag: use porcelain output Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 15/16] branch: use ref-filter printing APIs Karthik Nayak
2016-03-30 9:40 ` [PATCH v3 16/16] branch: implement '--format' option Karthik Nayak
2016-03-30 22:19 ` [PATCH v3 00/16] port branch.c to use ref-filter's printing options Junio C Hamano
2016-04-01 13:31 ` Dennis Kaarsemaker [this message]
2016-04-01 13:44 ` Dennis Kaarsemaker
2016-04-01 15:15 ` Ramsay Jones
2016-04-01 19:42 ` 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=1459517477.3493.5.camel@kaarsemaker.net \
--to=dennis@kaarsemaker.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=karthik.188@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.
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).