diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-22 20:39:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-22 21:24:47 -0800 |
| commit | d070e3a31bf94de1ef503b155a5e028545f7decc (patch) | |
| tree | a394ab813127f35832d04fd05c462f651e6d6310 /builtin-read-tree.c | |
| parent | a22c637124a2f591382d56546136a8e2bb2c2c66 (diff) | |
| download | git-d070e3a31bf94de1ef503b155a5e028545f7decc.tar.gz | |
Name hash fixups: export (and rename) remove_hash_entry
This makes the name hash removal function (which really just sets the
bit that disables lookups of it) available to external routines, and
makes read_cache_unmerged() use it when it drops an unmerged entry from
the index.
It's renamed to remove_index_entry(), and we drop the (unused) 'istate'
argument.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-read-tree.c')
| -rw-r--r-- | builtin-read-tree.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-read-tree.c b/builtin-read-tree.c index 726fb0b588..7bdc312e38 100644 --- a/builtin-read-tree.c +++ b/builtin-read-tree.c @@ -41,6 +41,7 @@ static int read_cache_unmerged(void) for (i = 0; i < active_nr; i++) { struct cache_entry *ce = active_cache[i]; if (ce_stage(ce)) { + remove_index_entry(ce); if (last && !strcmp(ce->name, last->name)) continue; cache_tree_invalidate_path(active_cache_tree, ce->name); |