clone: do not let --depth imply --shallow-submodules

diff --git a/unpack-trees.c b/unpack-trees.c
index f932e80e862cfafb7b909059b460dcb688c6dc0b..8e2032f4e592910d6f3336f95019647992113877 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1350,9 +1350,7 @@ static int verify_clean_subdirectory(const struct cache_entry *ce,
         * Then we need to make sure that we do not lose a locally
         * present file that is not ignored.
         */
-       pathbuf = xmalloc(namelen + 2);
-       memcpy(pathbuf, ce->name, namelen);
-       strcpy(pathbuf+namelen, "/");
+       pathbuf = xstrfmt("%.*s/", namelen, ce->name);
 
        memset(&d, 0, sizeof(d));
        if (o->dir)