]> rtime.felk.cvut.cz Git - git.git/commitdiff
Merge branch 'jc/maint-1.6.0-pack-directory'
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Mar 2009 00:31:02 +0000 (16:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Mar 2009 00:31:02 +0000 (16:31 -0800)
* jc/maint-1.6.0-pack-directory:
  Fix odb_mkstemp() on AIX

wrapper.c

index b07cdf299af66d4c503d5a788858b9cc56683143..d8efb1365a01104db568633fa8f6aef0c67b4cd1 100644 (file)
--- a/wrapper.c
+++ b/wrapper.c
@@ -268,9 +268,10 @@ int odb_mkstemp(char *template, size_t limit, const char *pattern)
                return fd;
 
        /* slow path */
-       safe_create_leading_directories(template);
+       /* some mkstemp implementations erase template on failure */
        snprintf(template, limit, "%s/%s",
                 get_object_directory(), pattern);
+       safe_create_leading_directories(template);
        return xmkstemp(template);
 }