From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Sun, 15 Aug 2010 10:16:25 +0000 (+0000)
Subject: log: test for regression introduced in v1.7.2-rc0~103^2~2
X-Git-Tag: v1.7.2.3~18^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=65113121a50cd765033d51204213c817832c59cf;p=git.git

log: test for regression introduced in v1.7.2-rc0~103^2~2

Add a regression test for the git log -M --follow $diff_option bug
introduced in v1.7.2-rc0~103^2~2, $diff_option being diff related
options like -p, --stat, --name-only etc.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 2230e606e..ead204e5c 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -436,5 +436,17 @@ test_expect_success 'log.decorate configuration' '
 
 '
 
-test_done
+test_expect_success 'show added path under "--follow -M"' '
+	# This tests for a regression introduced in v1.7.2-rc0~103^2~2
+	test_create_repo regression &&
+	(
+		cd regression &&
+		test_commit needs-another-commit &&
+		test_commit foo.bar &&
+		git log -M --follow -p foo.bar.t &&
+		git log -M --follow --stat foo.bar.t &&
+		git log -M --follow --name-only foo.bar.t
+	)
+'
 
+test_done