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 /unpack-trees.c | |
| parent | 6da9ded763b69685149c2f9a752e2005261bf0c3 (diff) | |
| parent | b60e188c51242b72061b5f2f0d4df80397f6125a (diff) | |
| download | git-30ea575876f61c38c59cd578afd8e8789857094b.tar.gz | |
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 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 29893bf659..6d9636623a 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -539,7 +539,8 @@ static struct cache_entry *create_ce_entry(const struct traverse_info *info, con struct cache_entry *ce = xcalloc(1, cache_entry_size(len)); ce->ce_mode = create_ce_mode(n->mode); - ce->ce_flags = create_ce_flags(len, stage); + ce->ce_flags = create_ce_flags(stage); + ce->ce_namelen = len; hashcpy(ce->sha1, n->sha1); make_traverse_path(ce->name, info, n); |