merge-recursive: match the unmerged index entry behaviour with merge-resolve

[git.git] / clone-pack.c

diff --git a/clone-pack.c b/clone-pack.c
index 4f4975b4ab7faecb172482f308999e48ea643d37..960921903eaa712523af0b03098970127729f363 100644 (file)
--- a/clone-pack.c
+++ b/clone-pack.c
@@ -211,7 +211,7 @@ static int clone_without_unpack(int fd[2])
 
        ifd = fd[0];
        snprintf(tmpfile, sizeof(tmpfile),
-                "%s/pack-XXXXXX", get_object_directory());
+                "%s/pack/tmp-XXXXXX", get_object_directory());
        ofd = mkstemp(tmpfile);
        if (ofd < 0)
                return error("unable to create temporary file %s", tmpfile);