On Fri, Apr 01, 2016 at 03:31:17PM +0200, Dennis Kaarsemaker wrote: > 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 That someting is es/test-gpg-tags. Karthik, can you maybe squash this fix in if you do another reroll? diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh index 98a1c49..7420e48 100755 --- a/t/t6302-for-each-ref-filter.sh +++ b/t/t6302-for-each-ref-filter.sh @@ -349,6 +349,8 @@ test_expect_success 'check %(if)...%(then)...%(end) atoms' ' 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 @@ -367,7 +369,9 @@ test_expect_success 'check %(if)...%(then)...%(else)...%(end) atoms' ' 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 @@ -385,7 +389,9 @@ test_expect_success 'ignore spaces in %(if) atom usage' ' 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 -- Dennis Kaarsemaker <dennis@xxxxxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html