git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: John Tapsell <johnflux@gmail.com>
To: git@vger.kernel.org
Cc: John Tapsell <johnflux@gmail.com>
Subject: [PATCH] Make the 'lock file exists' error more informative
Date: Wed,  4 Mar 2009 15:07:57 +0000	[thread overview]
Message-ID: <1236179277-12477-1-git-send-email-johnflux@gmail.com> (raw)

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

             reply	other threads:[~2009-03-04 15:09 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-04 15:07 John Tapsell [this message]
2009-03-04 15:18 ` [PATCH] Make the 'lock file exists' error more informative John Tapsell
2009-03-04 15:54 ` Matthieu Moy
2009-03-04 17:55   ` Junio C Hamano
  -- strict thread matches above, loose matches on Subject: below --
2009-03-04 15:00 [PATCH] Make the 'lock file' exists " John Tapsell
2009-03-04 15:03 ` John Tapsell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1236179277-12477-1-git-send-email-johnflux@gmail.com \
    --to=johnflux@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).