X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=lockfile.c;h=3dbb2d1ff9407a7417be294adedc5312e7421a96;hb=2254da06a5473ffde973337bad2c6a96eea61e20;hp=1db1a2fefcf40c4f6e613b7a8f750ab9c22adbc3;hpb=48fce9356531469b00bd0e1592d77e8b229316d0;p=git.git diff --git a/lockfile.c b/lockfile.c index 1db1a2fef..3dbb2d1ff 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; }