summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2010-08-15 10:16:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-16 02:20:11 (GMT)
commit65113121a50cd765033d51204213c817832c59cf (patch)
treebd46d2ff0a5911d02b1cc8b1f0117dc437ff89d7
parent44c48a909ae3d49afcaedb2b2cd042d1e329ee93 (diff)
downloadgit-65113121a50cd765033d51204213c817832c59cf.zip
git-65113121a50cd765033d51204213c817832c59cf.tar.gz
git-65113121a50cd765033d51204213c817832c59cf.tar.bz2
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>
-rwxr-xr-xt/t4202-log.sh14
1 files changed, 13 insertions, 1 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 2230e60..ead204e 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