diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-20 19:53:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-20 19:53:09 (GMT) |
| commit | 55c6e6dc38188d27b4ec0315db93d6c40725cdd6 (patch) | |
| tree | ede040677f6ad505638458f178d9527600ee7b4e /t | |
| parent | 16bfbe6352e90b87de26effe5ce120ab74ebafc7 (diff) | |
| parent | 65113121a50cd765033d51204213c817832c59cf (diff) | |
| download | git-55c6e6dc38188d27b4ec0315db93d6c40725cdd6.zip git-55c6e6dc38188d27b4ec0315db93d6c40725cdd6.tar.gz git-55c6e6dc38188d27b4ec0315db93d6c40725cdd6.tar.bz2 | |
Merge branch 'jc/maint-follow-rename-fix' into maint
* 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-x | t/t4202-log.sh | 14 |
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 |