summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-11 13:30:36 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-11 13:30:36 -0700
commita1ddd1145282b363dcfc08c6ab8fb0c688f88f16 (patch)
treed53f7f6cb6851d2497ada1aafb7e189ad7de7334 /combine-diff.c
parentcb4d6c2b7d5b710b9108a39b2df5fcff77c65463 (diff)
parent46ec510ac088ac2669e617a4c8c35e6218dabecc (diff)
downloadgit-a1ddd1145282b363dcfc08c6ab8fb0c688f88f16.tar.gz
Merge branch 'cb/log-follow-with-combined'
* cb/log-follow-with-combined: fix segfault with git log -c --follow
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/combine-diff.c b/combine-diff.c
index 3e8bb17831..6dc06093d3 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1305,6 +1305,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);
@@ -1375,6 +1376,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,