diff options
| author | Brandon Williams <bmwill@google.com> | 2017-06-12 22:13:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-13 18:40:51 (GMT) |
| commit | 82b474e025e89cfa294e81611c81355a73dc23a2 (patch) | |
| tree | 7e0114fa1a11212629ff9c47a95a59fdb69222bd /combine-diff.c | |
| parent | d6c41c20e688a1b284b92d92320ba56f639688de (diff) | |
| download | git-82b474e025e89cfa294e81611c81355a73dc23a2.zip git-82b474e025e89cfa294e81611c81355a73dc23a2.tar.gz git-82b474e025e89cfa294e81611c81355a73dc23a2.tar.bz2 | |
convert: convert convert_to_git to take an index
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c index 2848034..74f723a 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -1053,7 +1053,7 @@ 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(elem->path, result, len, &buf, safe_crlf)) { + if (convert_to_git(&the_index, elem->path, result, len, &buf, safe_crlf)) { free(result); result = strbuf_detach(&buf, &len); result_size = len; |