Merge branch 'maint'

diff --git a/pack-write.c b/pack-write.c
index 939ed56362d3c29bfc64e8cca91032df9a57961e..3621f1dd3258d9dcd63bf5a6738e5d54940ffbbb 100644 (file)
--- a/pack-write.c
+++ b/pack-write.c
@@ -45,7 +45,7 @@ char *write_idx_file(char *index_name, struct pack_idx_entry **objects,
        if (!index_name) {
                static char tmpfile[PATH_MAX];
                snprintf(tmpfile, sizeof(tmpfile),
-                        "%s/tmp_idx_XXXXXX", get_object_directory());
+                        "%s/pack/tmp_idx_XXXXXX", get_object_directory());
                fd = xmkstemp(tmpfile);
                index_name = xstrdup(tmpfile);
        } else {