summaryrefslogtreecommitdiff
path: root/lockfile.c
diff options
context:
space:
mode:
authorJohn Tapsell <johnflux@gmail.com>2009-03-04 15:00:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-03-05 04:35:19 (GMT)
commitbdfd739dac4c109ce360d38d0572d8717a46e795 (patch)
tree9c37767edd8fb48fc313acd8b8daab336728da43 /lockfile.c
parentf243319c21968c10d37cbb0c7f02127ac5d67d7f (diff)
downloadgit-bdfd739dac4c109ce360d38d0572d8717a46e795.zip
git-bdfd739dac4c109ce360d38d0572d8717a46e795.tar.gz
git-bdfd739dac4c109ce360d38d0572d8717a46e795.tar.bz2
Make the 'lock file' exists error more informative
It looks like someone did 90% of the work, then forgot to actually use the function in one place. Also the helper function did not use the correct variable. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'lockfile.c')
-rw-r--r--lockfile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lockfile.c b/lockfile.c
index 1db1a2f..3dbb2d1 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -158,7 +158,7 @@ static int lock_file(struct lock_file *lk, const char *path, int flags)
NORETURN void unable_to_lock_index_die(const char *path, int err)
{
- if (errno == EEXIST) {
+ if (err == EEXIST) {
die("Unable to create '%s.lock': %s.\n\n"
"If no other git process is currently running, this probably means a\n"
"git process crashed in this repository earlier. Make sure no other git\n"
@@ -184,7 +184,7 @@ int hold_lock_file_for_append(struct lock_file *lk, const char *path, int flags)
fd = lock_file(lk, path, flags);
if (fd < 0) {
if (flags & LOCK_DIE_ON_ERROR)
- die("unable to create '%s.lock': %s", path, strerror(errno));
+ unable_to_lock_index_die(path, errno);
return fd;
}