2009/3/4 John Tapsell <johnflux@xxxxxxxxx>:
> 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
>
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
