Junio C Hamano <gitster@xxxxxxxxx> writes: > Junio C Hamano <gitster@xxxxxxxxx> writes: > >>> May I kindly ask you to make this work on Windows, too? Just >>> >>> sed -i -e s/MINGW/MINGW,HAVENOT/ t4201-shortlog.sh >> >> HAVENOT??? >>> >>> on your Linux box and make it pass the tests. >>> >>> Thank you so much in advance. > > Ah, I think I am slower than my usual today. -- >8 -- Subject: SQUASH??? Make sure the test does not depend on the result of the previous tests; with MINGW prerequisite satisfied, a "reset to original and rebuild" in an earlier test was skipped, resulting in different history being tested with this and the next tests. --- t/t4201-shortlog.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh index 6c7c637481..9df054bf05 100755 --- a/t/t4201-shortlog.sh +++ b/t/t4201-shortlog.sh @@ -191,8 +191,14 @@ test_expect_success 'shortlog with --output=<file>' ' ' test_expect_success 'shortlog --committer (internal)' ' + git checkout --orphan side && + git commit --allow-empty -m one && + git commit --allow-empty -m two && + GIT_COMMITTER_NAME="Sin Nombre" git commit --allow-empty -m three && + cat >expect <<-\EOF && - 3 C O Mitter + 2 C O Mitter + 1 Sin Nombre EOF git shortlog -nsc HEAD >actual && test_cmp expect actual