summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-09-21 15:57:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-09-21 16:48:10 (GMT)
commit0734f209a9a5ede0f160d82bf4069fe2421f9f5c (patch)
tree17a45b1acb2eda03928b8a747910297a57adda3a
parentb78ea5fc3574a2ce262cfb37a7ea890caddd0cf5 (diff)
downloadgit-0734f209a9a5ede0f160d82bf4069fe2421f9f5c.zip
git-0734f209a9a5ede0f160d82bf4069fe2421f9f5c.tar.gz
git-0734f209a9a5ede0f160d82bf4069fe2421f9f5c.tar.bz2
combine-diff.c: remove implicit dependency on the_index
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--combine-diff.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c
index de7695e..4fa7707 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1054,7 +1054,8 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
if (is_file) {
struct strbuf buf = STRBUF_INIT;
- if (convert_to_git(&the_index, elem->path, result, len, &buf, global_conv_flags_eol)) {
+ if (convert_to_git(rev->diffopt.repo->index,
+ elem->path, result, len, &buf, global_conv_flags_eol)) {
free(result);
result = strbuf_detach(&buf, &len);
result_size = len;