summaryrefslogtreecommitdiff
path: root/lockfile.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-05 06:28:21 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-05 06:28:21 (GMT)
commite27e609bbf81271318d99f2643f378f3fde6c6c6 (patch)
tree331a4d351a1a310a131ae28f71f6d5fa3486224e /lockfile.c
parentd222984e3610c1558778f7a23d23b89f1d91fb36 (diff)
parent8977c110b5bbd230c28c727ddb85856067d55cfb (diff)
downloadgit-e27e609bbf81271318d99f2643f378f3fde6c6c6.zip
git-e27e609bbf81271318d99f2643f378f3fde6c6c6.tar.gz
git-e27e609bbf81271318d99f2643f378f3fde6c6c6.tar.bz2
Merge branch 'maint'
* maint: pack-check.c::verify_packfile(): don't run SHA-1 update on huge data Fix infinite loop when deleting multiple packed refs.
Diffstat (limited to 'lockfile.c')
-rw-r--r--lockfile.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/lockfile.c b/lockfile.c
index 261baff..731bbf3 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -27,9 +27,12 @@ static int lock_file(struct lock_file *lk, const char *path)
sprintf(lk->filename, "%s.lock", path);
fd = open(lk->filename, O_RDWR | O_CREAT | O_EXCL, 0666);
if (0 <= fd) {
- if (!lk->next) {
+ if (!lk->on_list) {
lk->next = lock_file_list;
lock_file_list = lk;
+ lk->on_list = 1;
+ }
+ if (lock_file_list) {
signal(SIGINT, remove_lock_file_on_signal);
atexit(remove_lock_file);
}
@@ -37,6 +40,8 @@ static int lock_file(struct lock_file *lk, const char *path)
return error("cannot fix permission bits on %s",
lk->filename);
}
+ else
+ lk->filename[0] = 0;
return fd;
}