summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-08-18 12:47:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-18 12:47:18 -0700
commitbd3a97a27a97485b130802d497214be312b737f9 (patch)
tree803a7822503dc81a00e54724f3dbe9f5963dec13 /t
parentMerge branch 'tf/string-list-init' (diff)
parentlog: test for regression introduced in v1.7.2-rc0~103^2~2 (diff)
downloadtgif-bd3a97a27a97485b130802d497214be312b737f9.tar.xz
Merge branch 'jc/maint-follow-rename-fix'
* jc/maint-follow-rename-fix: log: test for regression introduced in v1.7.2-rc0~103^2~2 diff --follow: do call diffcore_std() as necessary diff --follow: do not waste cycles while recursing
Diffstat (limited to 't')
-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 2230e606ed..ead204e5cb 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