Merge branch 'pg/maint-1.7.9-am-where-is-patch'

diff --git a/unpack-trees.c b/unpack-trees.c
index 33a581924e11167dc546bdf97c8d49460b43674e..29893bf65978d4ea14f669851ca37d2df445b503 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1296,7 +1296,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++) {