undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin-bundle create - use lock_file

Browse Source 
"git bundle create" left an invalid, partially written bundle if
an error occured during creation.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2007-08-12 10:44:06 -07:00
parent 95eb6853af
commit 4b37666ccb
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builtin-bundle.c
View File

@ -189,7 +189,9 @@ static int list_heads(struct bundle_header *header, int argc, const char **argv)
static int create_bundle(struct bundle_header *header, const char *path, static int create_bundle(struct bundle_header *header, const char *path,
int argc, const char **argv) int argc, const char **argv)
{ {
static struct lock_file lock;
int bundle_fd = -1; int bundle_fd = -1;
int bundle_to_stdout;
const char **argv_boundary = xmalloc((argc + 4) * sizeof(const char *)); const char **argv_boundary = xmalloc((argc + 4) * sizeof(const char *));
const char **argv_pack = xmalloc(5 * sizeof(const char *)); const char **argv_pack = xmalloc(5 * sizeof(const char *));
int i, ref_count = 0; int i, ref_count = 0;
@ -198,14 +200,11 @@ static int create_bundle(struct bundle_header *header, const char *path,
struct child_process rls; struct child_process rls;
FILE *rls_fout; FILE *rls_fout;
/* bundle_to_stdout = !strcmp(path, "-");
* NEEDSWORK: this should use something like lock-file if (bundle_to_stdout)
* to create temporary that is cleaned up upon error. bundle_fd = 1;
*/ else
bundle_fd = (!strcmp(path, "-") ? 1 : bundle_fd = hold_lock_file_for_update(&lock, path, 1);
open(path, O_CREAT | O_EXCL | O_WRONLY, 0666));
if (bundle_fd < 0)
return error("Could not create '%s': %s", path, strerror(errno));
/* write signature */ /* write signature */
write_or_die(bundle_fd, bundle_signature, strlen(bundle_signature)); write_or_die(bundle_fd, bundle_signature, strlen(bundle_signature));
@ -341,6 +340,9 @@ static int create_bundle(struct bundle_header *header, const char *path,
} }
if (finish_command(&rls)) if (finish_command(&rls))
return error ("pack-objects died"); return error ("pack-objects died");
close(bundle_fd);
if (!bundle_to_stdout)
commit_lock_file(&lock);
return 0; return 0;
} }