undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ls-files: convert prune_cache to take an index

Browse Source 
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams 2017-06-12 15:14:04 -07:00 committed by Junio C Hamano
parent 1d35e3bf05
commit 6510ae173a
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
builtin/ls-files.c
View File

@ -380,30 +380,31 @@ static void show_files(struct dir_struct *dir)
/* /*
* Prune the index to only contain stuff starting with "prefix" * Prune the index to only contain stuff starting with "prefix"
*/ */
static void prune_cache(const char *prefix, size_t prefixlen) static void prune_index(struct index_state *istate,
const char *prefix, size_t prefixlen)
{ {
int pos; int pos;
unsigned int first, last; unsigned int first, last;
if (!prefix) if (!prefix)
return; return;
pos = cache_name_pos(prefix, prefixlen); pos = index_name_pos(istate, prefix, prefixlen);
if (pos < 0) if (pos < 0)
pos = -pos-1; pos = -pos-1;
first = pos; first = pos;
last = active_nr; last = istate->cache_nr;
while (last > first) { while (last > first) {
int next = (last + first) >> 1; int next = (last + first) >> 1;
const struct cache_entry *ce = active_cache[next]; const struct cache_entry *ce = istate->cache[next];
if (!strncmp(ce->name, prefix, prefixlen)) { if (!strncmp(ce->name, prefix, prefixlen)) {
first = next+1; first = next+1;
continue; continue;
} }
last = next; last = next;
} }
memmove(active_cache, active_cache + pos, memmove(istate->cache, istate->cache + pos,
(last - pos) * sizeof(struct cache_entry *)); (last - pos) * sizeof(struct cache_entry *));
active_nr = last - pos; istate->cache_nr = last - pos;
} }
static int get_common_prefix_len(const char *common_prefix) static int get_common_prefix_len(const char *common_prefix)
@ -661,7 +662,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
max_prefix = common_prefix(&pathspec); max_prefix = common_prefix(&pathspec);
max_prefix_len = get_common_prefix_len(max_prefix); max_prefix_len = get_common_prefix_len(max_prefix);
prune_cache(max_prefix, max_prefix_len); prune_index(&the_index, max_prefix, max_prefix_len);
/* Treat unmatching pathspec elements as errors */ /* Treat unmatching pathspec elements as errors */
if (pathspec.nr && error_unmatch) if (pathspec.nr && error_unmatch)