diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-23 20:55:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-23 20:55:21 -0700 |
| commit | 30ea575876f61c38c59cd578afd8e8789857094b (patch) | |
| tree | 581da17bd126cf8f6dc45325a80551c4818622ab /builtin/checkout.c | |
| parent | 6da9ded763b69685149c2f9a752e2005261bf0c3 (diff) | |
| parent | b60e188c51242b72061b5f2f0d4df80397f6125a (diff) | |
| download | git-30ea575876f61c38c59cd578afd8e8789857094b.tar.gz git-30ea575876f61c38c59cd578afd8e8789857094b.tar.xz | |
Merge branch 'tg/ce-namelen-field'
Split lower bits of ce_flags field and creates a new ce_namelen
field in the in-core index structure.
* tg/ce-namelen-field:
Strip namelen out of ce_flags into a ce_namelen field
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 3980d5d06..6acca75f4 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -73,7 +73,8 @@ static int update_some(const unsigned char *sha1, const char *base, int baselen, hashcpy(ce->sha1, sha1); memcpy(ce->name, base, baselen); memcpy(ce->name + baselen, pathname, len - baselen); - ce->ce_flags = create_ce_flags(len, 0) | CE_UPDATE; + ce->ce_flags = create_ce_flags(0) | CE_UPDATE; + ce->ce_namelen = len; ce->ce_mode = create_ce_mode(mode); add_cache_entry(ce, ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); return 0; |