summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorThomas Gummerer <t.gummerer@gmail.com>2012-07-11 09:22:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-11 16:42:45 (GMT)
commitb60e188c51242b72061b5f2f0d4df80397f6125a (patch)
treea98bd286f05bca385fba527f3c7971a86cc78c14 /builtin/checkout.c
parent01388518c30c20ccbbb9f99e00314ef291ecda37 (diff)
downloadgit-b60e188c51242b72061b5f2f0d4df80397f6125a.zip
git-b60e188c51242b72061b5f2f0d4df80397f6125a.tar.gz
git-b60e188c51242b72061b5f2f0d4df80397f6125a.tar.bz2
Strip namelen out of ce_flags into a ce_namelen field
Strip the name length from the ce_flags field and move it into its own ce_namelen field in struct cache_entry. This will both give us a tiny bit of a performance enhancement when working with long pathnames and is a refactoring for more readability of the code. It enhances readability, by making it more clear what is a flag, and where the length is stored and make it clear which functions use stages in comparisions and which only use the length. It also makes CE_NAMEMASK private, so that users don't mistakenly write the name length in the flags. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
-rw-r--r--builtin/checkout.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 3980d5d..6acca75 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;