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/blame.c | |
parent | Merge branch 'nk/maint-gitweb-log-by-lines' (diff) | |
parent | Strip namelen out of ce_flags into a ce_namelen field (diff) | |
download | tgif-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/blame.c')
-rw-r--r-- | builtin/blame.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index 960c58d855..0d50273ce9 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2171,7 +2171,8 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt, ce = xcalloc(1, size); hashcpy(ce->sha1, origin->blob_sha1); memcpy(ce->name, path, len); - ce->ce_flags = create_ce_flags(len, 0); + ce->ce_flags = create_ce_flags(0); + 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); |