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

pack-refs: use lockfile as everybody else does.

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-10-03 02:15:18 -07:00
parent 47292d65de
commit 03a182107f
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
builtin-pack-refs.c
View File

@ -1,7 +1,6 @@
#include "cache.h" #include "cache.h"
#include "refs.h" #include "refs.h"
static const char *result_path, *lock_path;
static const char builtin_pack_refs_usage[] = static const char builtin_pack_refs_usage[] =
"git-pack-refs [--prune]"; "git-pack-refs [--prune]";
@ -17,12 +16,6 @@ struct pack_refs_cb_data {
FILE *refs_file; FILE *refs_file;
}; };
static void remove_lock_file(void)
{
if (lock_path)
unlink(lock_path);
}
static int do_not_prune(int flags) static int do_not_prune(int flags)
{ {
/* If it is already packed or if it is a symref, /* If it is already packed or if it is a symref,
@ -69,6 +62,8 @@ static void prune_refs(struct ref_to_prune *r)
} }
} }
static struct lock_file packed;
int cmd_pack_refs(int argc, const char **argv, const char *prefix) int cmd_pack_refs(int argc, const char **argv, const char *prefix)
{ {
int fd, i; int fd, i;
@ -88,14 +83,7 @@ int cmd_pack_refs(int argc, const char **argv, const char *prefix)
if (i != argc) if (i != argc)
usage(builtin_pack_refs_usage); usage(builtin_pack_refs_usage);
result_path = xstrdup(git_path("packed-refs")); fd = hold_lock_file_for_update(&packed, git_path("packed-refs"), 1);
lock_path = xstrdup(mkpath("%s.lock", result_path));
fd = open(lock_path, O_CREAT | O_EXCL | O_WRONLY, 0666);
if (fd < 0)
die("unable to create new ref-pack file (%s)", strerror(errno));
atexit(remove_lock_file);
cbdata.refs_file = fdopen(fd, "w"); cbdata.refs_file = fdopen(fd, "w");
if (!cbdata.refs_file) if (!cbdata.refs_file)
die("unable to create ref-pack file structure (%s)", die("unable to create ref-pack file structure (%s)",
@ -103,9 +91,8 @@ int cmd_pack_refs(int argc, const char **argv, const char *prefix)
for_each_ref(handle_one_ref, &cbdata); for_each_ref(handle_one_ref, &cbdata);
fsync(fd); fsync(fd);
fclose(cbdata.refs_file); fclose(cbdata.refs_file);
if (rename(lock_path, result_path) < 0) if (commit_lock_file(&packed) < 0)
die("unable to overwrite old ref-pack file (%s)", strerror(errno)); die("unable to overwrite old ref-pack file (%s)", strerror(errno));
lock_path = NULL;
if (cbdata.prune) if (cbdata.prune)
prune_refs(cbdata.ref_to_prune); prune_refs(cbdata.ref_to_prune);
return 0; return 0;