threads / patch / 18132

patchMake the 'lock file exists' error more informative

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

## tl;dr

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

replies: 3people: 3as markdown or json

John Tapsell· Mar 4, 2009, 15:07 UTC · lore
It looks like someone did 90% of the work, then forgot to actually use
the function
---
 lockfile.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Show changes to lockfile.c +2 −2
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;
 	}
 
-- 
1.6.2.rc2.23.g77740
John Tapsell· Mar 4, 2009, 15:18 UTC · re: John Tapsell · lore

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

2009/3/4 John Tapsell <johnflux@gmail.com>:
> It looks like someone did 90% of the work, then forgot to actually use
> the function

It seems that this was already fixed in the 'next' branch. (Sorry, I didn't know about this branch before).

The first bug fix is still required. (well, for niceness. In practise it isn't)

John Tapsell
Show 30 quoted lines
> ---
>  lockfile.c |    4 ++--
>  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;
>        }
>
> --
> 1.6.2.rc2.23.g77740
>
>
Matthieu Moy· Mar 4, 2009, 15:54 UTC · re: John Tapsell · lore

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

John Tapsell <johnflux@gmail.com> writes:
> It looks like someone did 90% of the work, then forgot to actually use
> the function
someone = me ;-).

The message is a bit inacurrate: the function is already used in two places, I just didn't notice this one.

> -	if (errno == EEXIST) {
> +	if (err == EEXIST) {
Oops, right.
> -			die("unable to create '%s.lock': %s", path, strerror(errno));
> +			unable_to_lock_index_die(path, errno);

Actually, _this_ instance is still to be fixed in next. You probably looked at the other one that my original message fixes.

IOW:
Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr>
-- 
Matthieu
Junio C Hamano· Mar 4, 2009, 17:55 UTC · re: Matthieu Moy · lore

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

Matthieu Moy <Matthieu.Moy@imag.fr> writes:
Show 20 quoted lines
> John Tapsell <johnflux@gmail.com> writes:
>
>> It looks like someone did 90% of the work, then forgot to actually use
>> the function
>
> someone = me ;-).
>
> The message is a bit inacurrate: the function is already used in two
> places, I just didn't notice this one.
>
>> -	if (errno == EEXIST) {
>> +	if (err == EEXIST) {
>
> Oops, right.
>
>> -			die("unable to create '%s.lock': %s", path, strerror(errno));
>> +			unable_to_lock_index_die(path, errno);
>
> Actually, _this_ instance is still to be fixed in next. You probably
> looked at the other one that my original message fixes.

Not in 'next', but in the maintenance track of v1.6.2.X and merged upwards, as v1.6.2~11^2~2 (More friendly message when locking the index fails., 2009-02-19) is obviously in v1.6.2 just released.

John, congratulations for fixing the first bug immediately after a big release. Please make it a habit to sign off your patches.

← back to recent threads