diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-06-24 14:28:40 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-06-24 14:28:40 -0700 |
commit | 5812b3f73b0d319650032833840278fd556fecf3 (patch) | |
tree | 288ef568735a903d06a5a6fa27c96015c222e161 /blame.c | |
parent | 1c3d87cf5594cc7e57d71c7b2d99dd4982285951 (diff) | |
parent | a84f3e59ebde9e891275ef8325c432db6bdf950c (diff) | |
download | git-5812b3f73b0d319650032833840278fd556fecf3.tar.gz |
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 'blame.c')
-rw-r--r-- | blame.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -229,7 +229,7 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt, if (strbuf_read(&buf, 0, 0) < 0) die_errno("failed to read from stdin"); } - convert_to_git(path, buf.buf, buf.len, &buf, 0); + convert_to_git(&the_index, path, buf.buf, buf.len, &buf, 0); origin->file.ptr = buf.buf; origin->file.size = buf.len; pretend_sha1_file(buf.buf, buf.len, OBJ_BLOB, origin->blob_oid.hash); |