diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-15 03:03:17 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-21 23:44:31 +0300 |
| commit | 7a51ed66f653c248993b3c4a61932e47933d835e (patch) | |
| tree | eb40e8e3b00979deee24e0a03a32b5f25d1f275e /merge-index.c | |
| parent | ce33288ea6b81a2f4f5aecd72177bcc8174562ae (diff) | |
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 'merge-index.c')
| -rw-r--r-- | merge-index.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-index.c b/merge-index.c index fa719cb0b1..bbb700b54e 100644 --- a/merge-index.c +++ b/merge-index.c @@ -48,7 +48,7 @@ static int merge_entry(int pos, const char *path) break; found++; strcpy(hexbuf[stage], sha1_to_hex(ce->sha1)); - sprintf(ownbuf[stage], "%o", ntohl(ce->ce_mode)); + sprintf(ownbuf[stage], "%o", ce->ce_mode); arguments[stage] = hexbuf[stage]; arguments[stage + 4] = ownbuf[stage]; } while (++pos < active_nr); |