# [PATCH] Make the 'lock file exists' error more informative 4 messages from 2009-03-04 to 2009-03-04. Participants: John Tapsell, Matthieu Moy, Junio C Hamano. Thread: https://gitlist.dev/t/18132 ## John Tapsell, 2009-03-04 15:07 Subject: [PATCH] Make the 'lock file exists' error more informative Message-ID: <1236179277-12477-1-git-send-email-johnflux@gmail.com> URL: https://gitlist.dev/e/1236179277-12477-1-git-send-email-johnflux%40gmail.com ``` 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(-) 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, 2009-03-04 15:18 Subject: Re: [PATCH] Make the 'lock file exists' error more informative Message-ID: <43d8ce650903040718m6fc384ddv695c546276b7d3c3@mail.gmail.com> URL: https://gitlist.dev/e/43d8ce650903040718m6fc384ddv695c546276b7d3c3%40mail.gmail.com In-Reply-To: <1236179277-12477-1-git-send-email-johnflux@gmail.com> ``` 2009/3/4 John Tapsell : > 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 > --- >  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, 2009-03-04 15:54 Subject: Re: [PATCH] Make the 'lock file exists' error more informative Message-ID: URL: https://gitlist.dev/e/vpqvdqpb7w6.fsf%40bauges.imag.fr In-Reply-To: <1236179277-12477-1-git-send-email-johnflux@gmail.com> ``` John Tapsell 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 ``` ## Junio C Hamano, 2009-03-04 17:55 Subject: Re: [PATCH] Make the 'lock file exists' error more informative Message-ID: <7veixd5g1r.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7veixd5g1r.fsf%40gitster.siamese.dyndns.org In-Reply-To: ``` Matthieu Moy writes: > John Tapsell 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. ```