diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-23 17:52:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-23 17:52:02 -0700 |
| commit | 6b516d984bc72b359a14eeddfddca578cef52297 (patch) | |
| tree | ca63e5f4932f1a5cefcdae27d829f3dc0ff5a383 /sha1_file.c | |
| parent | f2ab7f82b7bd8f0147f656e7d279236d1bd68921 (diff) | |
| parent | 74b1e1235781bbe5c90b802c1551446a5f5d69f1 (diff) | |
| download | git-6b516d984bc72b359a14eeddfddca578cef52297.tar.gz | |
Merge branch 'maint'
* maint:
git-svn: make rebuild respect rewriteRoot option
Workaround for AIX mkstemp()
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sha1_file.c b/sha1_file.c index 191f814e09..92299ed622 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2118,6 +2118,7 @@ static int create_tmpfile(char *buffer, size_t bufsiz, const char *filename) fd = mkstemp(buffer); if (fd < 0 && dirlen) { /* Make sure the directory exists */ + memcpy(buffer, filename, dirlen); buffer[dirlen-1] = 0; if (mkdir(buffer, 0777) || adjust_shared_perm(buffer)) return -1; |