diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-14 16:03:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-21 12:44:31 -0800 |
| commit | 7a51ed66f653c248993b3c4a61932e47933d835e (patch) | |
| tree | eb40e8e3b00979deee24e0a03a32b5f25d1f275e /builtin-read-tree.c | |
| parent | ce33288ea6b81a2f4f5aecd72177bcc8174562ae (diff) | |
| download | git-7a51ed66f653c248993b3c4a61932e47933d835e.tar.gz | |
Make on-disk index representation separate from in-core one
This converts the index explicitly on read and write to its on-disk
format, allowing the in-core format to contain more flags, and be
simpler.
In particular, the in-core format is now host-endian (as opposed to the
on-disk one that is network endian in order to be able to be shared
across machines) and as a result we can dispense with all the
htonl/ntohl on accesses to the cache_entry fields.
This will make it easier to make use of various temporary flags that do
not exist in the on-disk format.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
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; } |