mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/maint-1.6.0-pack-directory'

Browse Source 
* jc/maint-1.6.0-pack-directory:
  Make sure objects/pack exists before creating a new pack
This commit is contained in:
Junio C Hamano
2009-02-25 14:48:30 -08:00
parent 69707d616f 6e180cdcec
commit bb0cebd7d0
7 changed files with 72 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pack-write.c
View File

@ -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