Junio C Hamano <gitster@xxxxxxxxx> writes: > The frustrating thing is that > > GIT_SKIP_TESTS='t[0-35-9]??? t4[01]??' \ > GIT_TEST_OPTS='-i -v' \ > make -j4 test > > fails very reliably with the above log, but: > > (1) running the same "../../git-shortlog" in "t/trash directory.t4203-mailmap/" > immediately after the test failed does emit the expected result; > > (2) going down to t/ and manually running t4203-mailmap.sh alone succeeds; > > (3) running the tests serially (i.e. without -j4) allows the test to succeed. The test is broken and here is a fix I'll be squashing into the series. The mystery was simply that it failed when the test was run in the background (i.e. !isatty(0)) because it used "git shortlog" without saying that it wants a shortlog from HEAD down to root explicitly. t/t4203-mailmap.sh | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git i/t/t4203-mailmap.sh w/t/t4203-mailmap.sh index c7a1238..094d905 100755 --- i/t/t4203-mailmap.sh +++ w/t/t4203-mailmap.sh @@ -24,7 +24,7 @@ nick1 (1): EOF test_expect_success 'No mailmap' ' - git shortlog >actual && + git shortlog HEAD >actual && test_cmp expect actual ' @@ -39,7 +39,7 @@ EOF test_expect_success 'default .mailmap' ' echo "Repo Guy <author@xxxxxxxxxxx>" > .mailmap && - git shortlog >actual && + git shortlog HEAD >actual && test_cmp expect actual ' @@ -57,7 +57,7 @@ test_expect_success 'log.mailmap set' ' mkdir internal_mailmap && echo "Internal Guy <bugs@xxxxxxxxxx>" > internal_mailmap/.mailmap && git config log.mailmap internal_mailmap/.mailmap && - git shortlog >actual && + git shortlog HEAD >actual && test_cmp expect actual ' @@ -72,7 +72,7 @@ EOF test_expect_success 'log.mailmap override' ' echo "External Guy <author@xxxxxxxxxxx>" >> internal_mailmap/.mailmap && git config log.mailmap internal_mailmap/.mailmap && - git shortlog >actual && + git shortlog HEAD >actual && test_cmp expect actual ' @@ -88,7 +88,7 @@ EOF test_expect_success 'log.mailmap file non-existant' ' rm internal_mailmap/.mailmap && rmdir internal_mailmap && - git shortlog >actual && + git shortlog HEAD >actual && test_cmp expect actual ' @@ -102,7 +102,7 @@ nick1 (1): EOF test_expect_success 'No mailmap files, but configured' ' rm .mailmap && - git shortlog >actual && + git shortlog HEAD >actual && test_cmp expect actual ' @@ -162,7 +162,7 @@ test_expect_success 'Shortlog output (complex mapping)' ' echo "Santa Claus <santa.claus@xxxxxxxxxxxx> <me@xxxxxxxxxx>" >> internal_mailmap/.mailmap && echo "Santa Claus <santa.claus@xxxxxxxxxxxx> <me@xxxxxxxxxx>" >> internal_mailmap/.mailmap && - git shortlog -e >actual && + git shortlog -e HEAD >actual && test_cmp expect actual ' -- 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
