X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=unpack-trees.c;h=6d9636623a2cbb5d5a38eb58d625ef0164d953c0;hb=15999998fbda60552742275570947431b57108ae;hp=33a581924e11167dc546bdf97c8d49460b43674e;hpb=67117596173cc49b0ca4b8b5739c5fd794a7022a;p=~andy%2Fgit

diff --git a/unpack-trees.c b/unpack-trees.c
index 33a581924..6d9636623 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);
 
@@ -1296,7 +1297,7 @@ static int verify_clean_subdirectory(struct cache_entry *ce,
 	 * First let's make sure we do not have a local modification
 	 * in that directory.
 	 */
-	namelen = strlen(ce->name);
+	namelen = ce_namelen(ce);
 	for (i = locate_in_src_index(ce, o);
 	     i < o->src_index->cache_nr;
 	     i++) {