diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-11 16:46:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-11 16:46:20 -0800 |
| commit | e0197c9aae39b0f1ba6c21d1f6d0bae5de03a44d (patch) | |
| tree | 8ce3be12cc0fba866845b18e977c264fbcf54792 /builtin-read-tree.c | |
| parent | 3960a951795819e6cd09422e15092b45cdd46f73 (diff) | |
| parent | 9cb76b8cdc8ac62a77080595f6443613fd64bab3 (diff) | |
| download | git-e0197c9aae39b0f1ba6c21d1f6d0bae5de03a44d.tar.gz | |
Merge branch 'lt/in-core-index'
* lt/in-core-index:
lazy index hashing
Create pathname-based hash-table lookup into index
read-cache.c: introduce is_racy_timestamp() helper
read-cache.c: fix a couple more CE_REMOVE conversion
Also use unpack_trees() in do_diff_cache()
Make run_diff_index() use unpack_trees(), not read_tree()
Avoid running lstat(2) on the same cache entry.
index: be careful when handling long names
Make on-disk index representation separate from in-core one
Diffstat (limited to 'builtin-read-tree.c')
| -rw-r--r-- | builtin-read-tree.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-read-tree.c b/builtin-read-tree.c index c0ea0342b7..5785401753 100644 --- a/builtin-read-tree.c +++ b/builtin-read-tree.c @@ -45,8 +45,7 @@ static int read_cache_unmerged(void) continue; cache_tree_invalidate_path(active_cache_tree, ce->name); last = ce; - ce->ce_mode = 0; - ce->ce_flags &= ~htons(CE_STAGEMASK); + ce->ce_flags |= CE_REMOVE; } *dst++ = ce; } |