diff options
| -rw-r--r-- | combine-diff.c | 3 | ||||
| -rwxr-xr-x | t/t4202-log.sh | 14 |
2 files changed, 17 insertions, 0 deletions
diff --git a/combine-diff.c b/combine-diff.c index 7f6187f9c..21fd00ff6 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -1120,6 +1120,7 @@ void diff_tree_combined(const unsigned char *sha1, int i, num_paths, needsep, show_log_first, num_parent = parents->nr; diffopts = *opt; + diff_tree_setup_paths(diffopts.pathspec.raw, &diffopts); diffopts.output_format = DIFF_FORMAT_NO_OUTPUT; DIFF_OPT_SET(&diffopts, RECURSIVE); DIFF_OPT_CLR(&diffopts, ALLOW_EXTERNAL); @@ -1187,6 +1188,8 @@ void diff_tree_combined(const unsigned char *sha1, paths = paths->next; free(tmp); } + + diff_tree_release_paths(&diffopts); } void diff_tree_combined_merge(const struct commit *commit, int dense, diff --git a/t/t4202-log.sh b/t/t4202-log.sh index fa686b887..d9e587a96 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -542,6 +542,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 |