Skip to content

Commit

Permalink
Make the 'lock file' exists error more informative
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
John Tapsell authored and Junio C Hamano committed Mar 5, 2009
1 parent f243319 commit bdfd739
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lockfile.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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;
}

Expand Down

0 comments on commit bdfd739

Please sign in to comment.