diff options
| author | Karsten Blees <karsten.blees@gmail.com> | 2013-11-14 19:22:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-18 21:04:24 (GMT) |
| commit | 419a597f6408d5b5cffe3e278258f58b47d15ad3 (patch) | |
| tree | 511ee6ee942cb1c10a3cfb3030ec255ddbed2fb3 /unpack-trees.c | |
| parent | 8b013788a14b96b8d20b1f6bc76a42f9733aefad (diff) | |
| download | git-419a597f6408d5b5cffe3e278258f58b47d15ad3.zip git-419a597f6408d5b5cffe3e278258f58b47d15ad3.tar.gz git-419a597f6408d5b5cffe3e278258f58b47d15ad3.tar.bz2 | |
name-hash.c: remove cache entries instead of marking them CE_UNHASHED
The new hashmap implementation supports remove, so really remove unused
cache entries from the name hashmap instead of just marking them.
The CE_UNHASHED flag and CE_STATE_MASK are no longer needed.
Keep the CE_HASHED flag to prevent adding entries twice.
Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 86f5f88..36f3a7d 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -105,7 +105,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, static void do_add_entry(struct unpack_trees_options *o, struct cache_entry *ce, unsigned int set, unsigned int clear) { - clear |= CE_HASHED | CE_UNHASHED; + clear |= CE_HASHED; if (set & CE_REMOVE) set |= CE_WT_REMOVE; |