From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 20 Dec 2016 18:35:54 +0000 (-0800)
Subject: t4201: make tests work with and without the MINGW prerequiste
X-Git-Tag: v2.12.0-rc0~98^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc44f9332a8f6b258d7b7d2ecba063aa7f48e182;p=thirdparty%2Fgit.git

t4201: make tests work with and without the MINGW prerequiste

Make sure the tests do 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.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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