My Various Git Projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b78ea5f
)
combine-diff.c: remove implicit dependency on the_index
author
Nguyễn Thái Ngọc Duy
<pclouds@gmail.com>
Fri, 21 Sep 2018 15:57:20 +0000
(17:57 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 21 Sep 2018 16:48:10 +0000
(09:48 -0700)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
combine-diff.c
patch
|
blob
|
history
diff --git
a/combine-diff.c
b/combine-diff.c
index
de7695e
..
4fa7707
100644
(file)
--- 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;