diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-11 13:30:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-11 13:30:36 -0700 |
| commit | a1ddd1145282b363dcfc08c6ab8fb0c688f88f16 (patch) | |
| tree | d53f7f6cb6851d2497ada1aafb7e189ad7de7334 /t/t4202-log.sh | |
| parent | Merge branch 'xq/credential-osxkeychain' (diff) | |
| parent | fix segfault with git log -c --follow (diff) | |
| download | tgif-a1ddd1145282b363dcfc08c6ab8fb0c688f88f16.tar.xz | |
Merge branch 'cb/log-follow-with-combined'
* cb/log-follow-with-combined:
fix segfault with git log -c --follow
Diffstat (limited to 't/t4202-log.sh')
| -rwxr-xr-x | t/t4202-log.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 9243a97993..cb03d28769 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -530,6 +530,20 @@ test_expect_success 'show added path under "--follow -M"' ' ) ' +test_expect_success 'git log -c --follow' ' + test_create_repo follow-c && + ( + cd follow-c && + test_commit initial file original && + git rm file && + test_commit rename file2 original && + git reset --hard initial && + test_commit modify file foo && + git merge -m merge rename && + git log -c --follow file2 + ) +' + cat >expect <<\EOF * commit COMMIT_OBJECT_NAME |\ Merge: MERGE_PARENTS |