diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-06-25 00:28:40 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-06-25 00:28:40 +0300 |
commit | 5812b3f73b0d319650032833840278fd556fecf3 (patch) | |
tree | 288ef568735a903d06a5a6fa27c96015c222e161 /dir.c | |
parent | 1c3d87cf5594cc7e57d71c7b2d99dd4982285951 (diff) | |
parent | a84f3e59ebde9e891275ef8325c432db6bdf950c (diff) |
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 'dir.c')
-rw-r--r-- | dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -804,7 +804,7 @@ static int add_excludes(const char *fname, const char *base, int baselen, (pos = index_name_pos(istate, fname, strlen(fname))) >= 0 && !ce_stage(istate->cache[pos]) && ce_uptodate(istate->cache[pos]) && - !would_convert_to_git(fname)) + !would_convert_to_git(istate, fname)) hashcpy(sha1_stat->sha1, istate->cache[pos]->oid.hash); else |