threads / patch / 18130

patchMake the 'lock file' exists error more informative

Subject: [PATCH] Make the 'lock file' exists error more informative

## tl;dr

2 messages between Mar 4, 2009 and Mar 4, 2009. Diffs are folded; open one to read it.

replies: 1people: 1as markdown or json

John Tapsell· Mar 4, 2009, 15:00 UTC · lore

It looks like someone did 90% of the work, then forgot to actually use
the function
---
 lockfile.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to lockfile.c +1 −1

diff --git a/lockfile.c b/lockfile.c
index 1db1a2f..6772f38 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -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, strerror(errno));
 		return fd;
 	}

-- 
1.6.2.rc1.3.g7d31b.dirty

John Tapsell· Mar 4, 2009, 15:03 UTC · re: John Tapsell · lore

Re: [PATCH] Make the 'lock file' exists error more informative

Argh, I'm so sorry.  After all that, I went and sent a broken version.
 Plus I just noticed another bug.  Will retry..

2009/3/4 John Tapsell <johnflux@gmail.com>:

Show 23 quoted lines

> It looks like someone did 90% of the work, then forgot to actually use
> the function
> ---
>  lockfile.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/lockfile.c b/lockfile.c
> index 1db1a2f..6772f38 100644
> --- a/lockfile.c
> +++ b/lockfile.c
> @@ -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, strerror(errno));
>                return fd;
>        }
>
> --
> 1.6.2.rc1.3.g7d31b.dirty
>
>