* [PATCH] Make the 'lock file' exists error more informative
@ 2009-03-04 15:00 John Tapsell
2009-03-04 15:03 ` John Tapsell
0 siblings, 1 reply; 6+ messages in thread
From: John Tapsell @ 2009-03-04 15:00 UTC (permalink / raw)
To: git; +Cc: John Tapsell
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Make the 'lock file' exists error more informative
2009-03-04 15:00 [PATCH] Make the 'lock file' exists error more informative John Tapsell
@ 2009-03-04 15:03 ` John Tapsell
0 siblings, 0 replies; 6+ messages in thread
From: John Tapsell @ 2009-03-04 15:03 UTC (permalink / raw)
To: git
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>:
> 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
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] Make the 'lock file exists' error more informative
@ 2009-03-04 15:07 John Tapsell
2009-03-04 15:18 ` John Tapsell
2009-03-04 15:54 ` Matthieu Moy
0 siblings, 2 replies; 6+ messages in thread
From: John Tapsell @ 2009-03-04 15:07 UTC (permalink / raw)
To: git; +Cc: John Tapsell
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Make the 'lock file exists' error more informative
2009-03-04 15:07 [PATCH] Make the 'lock file exists' " John Tapsell
@ 2009-03-04 15:18 ` John Tapsell
2009-03-04 15:54 ` Matthieu Moy
1 sibling, 0 replies; 6+ messages in thread
From: John Tapsell @ 2009-03-04 15:18 UTC (permalink / raw)
To: git
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
> ---
> 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
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Make the 'lock file exists' error more informative
2009-03-04 15:07 [PATCH] Make the 'lock file exists' " John Tapsell
2009-03-04 15:18 ` John Tapsell
@ 2009-03-04 15:54 ` Matthieu Moy
2009-03-04 17:55 ` Junio C Hamano
1 sibling, 1 reply; 6+ messages in thread
From: Matthieu Moy @ 2009-03-04 15:54 UTC (permalink / raw)
To: John Tapsell; +Cc: git
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Make the 'lock file exists' error more informative
2009-03-04 15:54 ` Matthieu Moy
@ 2009-03-04 17:55 ` Junio C Hamano
0 siblings, 0 replies; 6+ messages in thread
From: Junio C Hamano @ 2009-03-04 17:55 UTC (permalink / raw)
To: Matthieu Moy; +Cc: John Tapsell, git
Matthieu Moy <Matthieu.Moy@imag.fr> writes:
> 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.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-03-04 17:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-04 15:00 [PATCH] Make the 'lock file' exists error more informative John Tapsell
2009-03-04 15:03 ` John Tapsell
-- strict thread matches above, loose matches on Subject: below --
2009-03-04 15:07 [PATCH] Make the 'lock file exists' " John Tapsell
2009-03-04 15:18 ` John Tapsell
2009-03-04 15:54 ` Matthieu Moy
2009-03-04 17:55 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).