summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-24 21:28:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-24 21:28:40 (GMT)
commit5812b3f73b0d319650032833840278fd556fecf3 (patch)
tree288ef568735a903d06a5a6fa27c96015c222e161 /combine-diff.c
parent1c3d87cf5594cc7e57d71c7b2d99dd4982285951 (diff)
parenta84f3e59ebde9e891275ef8325c432db6bdf950c (diff)
downloadgit-5812b3f73b0d319650032833840278fd556fecf3.zip
git-5812b3f73b0d319650032833840278fd556fecf3.tar.gz
git-5812b3f73b0d319650032833840278fd556fecf3.tar.bz2
Merge branch 'bw/ls-files-sans-the-index'
Code clean-up. * bw/ls-files-sans-the-index: ls-files: factor out tag calculation ls-files: factor out debug info into a function ls-files: convert show_files to take an index ls-files: convert show_ce_entry to take an index ls-files: convert prune_cache to take an index ls-files: convert ce_excluded to take an index ls-files: convert show_ru_info to take an index ls-files: convert show_other_files to take an index ls-files: convert show_killed_files to take an index ls-files: convert write_eolinfo to take an index ls-files: convert overlay_tree_on_cache to take an index tree: convert read_tree to take an index parameter convert: convert renormalize_buffer to take an index convert: convert convert_to_git to take an index convert: convert convert_to_git_filter_fd to take an index convert: convert crlf_to_git to take an index convert: convert get_cached_convert_stats_ascii to take an index
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c
index ec9d930..9e163d5 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;