On Thu, Oct 20, 2022 at 10:39:54PM -0400, Taylor Blau wrote: > --- 8< --- > diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh > index 0abe5354fc..566d581e1b 100755 > --- a/t/t4201-shortlog.sh > +++ b/t/t4201-shortlog.sh > @@ -356,6 +356,19 @@ test_expect_success 'shortlog can match multiple groups' ' > test_cmp expect actual > ' > > +test_expect_success 'shortlog can match multiple format groups' ' > + cat >expect <<-\EOF && > + 2 User B <b@xxxxxxxxxxx> > + 1 A U Thor <author@xxxxxxxxxxx> > + 1 User A <a@xxxxxxxxxxx> > + EOF > + git shortlog -ns \ > + --group="%(trailers:valueonly,separator=%0x00,key=some-trailer)" \ > + --group="%(trailers:valueonly,separator=%0x00,key=another-trailer)" \ > + -2 HEAD >actual && > + test_cmp expect actual > +' > + > test_expect_success 'set up option selection tests' ' > git commit --allow-empty -F - <<-\EOF > subject > --- >8 --- > > The gross bit there really is the 'separator=%0x00' thing, since the > "trailers" pretty format gives us a NL character already. I suppose that > you could do something like this on top instead: IMHO the new test should avoid using trailers entirely, to avoid the notion that they are necessary to create the duplicate situation. In a normal repository, the most obvious one is just asking about both authors and committers: git shortlog --group=format:%cn --group=format:%an Most commits will have the same value for both, but we want to credit the commit to them only once. Of course in our fake test-lib world, authors and committers are different by default. :-/ But it's easy enough to make more normal-looking commits, perhaps like: diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh index 0abe5354fc..f0ff8a1714 100755 --- a/t/t4201-shortlog.sh +++ b/t/t4201-shortlog.sh @@ -356,6 +356,20 @@ test_expect_success 'shortlog can match multiple groups' ' test_cmp expect actual ' +test_expect_success 'shortlog can match multiple format groups' ' + GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME \ + git commit --allow-empty -m "identical names" && + cat >expect <<-\EOF && + 2 A U Thor + 1 C O Mitter + EOF + git shortlog -ns \ + --group=%cn \ + --group=%an \ + -2 HEAD >actual && + test_cmp expect actual +' + test_expect_success 'set up option selection tests' ' git commit --allow-empty -F - <<-\EOF subject You could also get fancier by dropping "-s" and making sure that the commits were attributed as expected, but I think the count covers things. -Peff
