diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-25 14:48:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-25 14:50:05 -0800 |
| commit | bb0cebd7d0ac9bf2ddf94fe5579603819c4a1fc7 (patch) | |
| tree | 1fdfa7e92aa0290bacfb64d77aad894d9915785a /pack-write.c | |
| parent | 69707d616fd3acda6ecc47198edeaaa87f2cfcea (diff) | |
| parent | 6e180cdcecbb3e828aa892925d7ef67abf81ad80 (diff) | |
| download | git-bb0cebd7d0ac9bf2ddf94fe5579603819c4a1fc7.tar.gz | |
Merge branch 'jc/maint-1.6.0-pack-directory'
* jc/maint-1.6.0-pack-directory:
Make sure objects/pack exists before creating a new pack
Diffstat (limited to 'pack-write.c')
| -rw-r--r-- | pack-write.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pack-write.c b/pack-write.c index b426006c58..7053538f4c 100644 --- a/pack-write.c +++ b/pack-write.c @@ -44,9 +44,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/pack/tmp_idx_XXXXXX", get_object_directory()); - fd = xmkstemp(tmpfile); + fd = odb_mkstemp(tmpfile, sizeof(tmpfile), "pack/tmp_idx_XXXXXX"); index_name = xstrdup(tmpfile); } else { unlink(index_name); @@ -239,7 +237,7 @@ char *index_pack_lockfile(int ip_out) char packname[46]; /* - * The first thing we expects from index-pack's output + * The first thing we expect from index-pack's output * is "pack\t%40s\n" or "keep\t%40s\n" (46 bytes) where * %40s is the newly created pack SHA1 name. In the "keep" * case, we need it to remove the corresponding .keep file |