[PATCH] More friendly message when locking the index fails.

[Matthieu Moy <Matthieu.Moy@imag.fr>]

Just saying that index.lock exists doesn't tell the user _what_ to do
to fix the problem. We should give an indication that it's normally
safe to delete index.lock after making sure git isn't running here.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
Sverre Rabbelier <srabbelier@gmail.com> writes:

> How about "If no other git process is currently running, this probably
> means...." instead? E.g., sometimes I run 'git commit' in one terminal
> window, and then switch to another before committing (to review the
> diff for example), which would cause an index.lock file to be present
> validly.

Right, here's an updated version.

 builtin-update-index.c |   12 ++++++++++--
 lockfile.c             |   10 +++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/builtin-update-index.c b/builtin-update-index.c
index 5604977..23b97db 100644
--- a/builtin-update-index.c
+++ b/builtin-update-index.c
@@ -742,8 +742,16 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 		if (newfd < 0) {
 			if (refresh_flags & REFRESH_QUIET)
 				exit(128);
-			die("unable to create '%s.lock': %s",
-			    get_index_file(), strerror(lock_error));
+			if (lock_error == 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"
+				    "process is running and remove the file manually to continue.",
+				    get_index_file(), strerror(lock_error));
+			} else {
+				die("Unable to create '%s.lock': %s",
+				    get_index_file(), strerror(lock_error));
+			}
 		}
 		if (write_cache(newfd, active_cache, active_nr) ||
 		    commit_locked_index(lock_file))
diff --git a/lockfile.c b/lockfile.c
index 021c337..9bde859 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -159,7 +159,15 @@ int hold_lock_file_for_update(struct lock_file *lk, const char *path, int flags)
 {
 	int fd = lock_file(lk, path, flags);
 	if (fd < 0 && (flags & LOCK_DIE_ON_ERROR))
-		die("unable to create '%s.lock': %s", path, strerror(errno));
+		if (errno == 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"
+			    "process is running and remove the file manually to continue.",
+			    path, strerror(errno));
+		} else {
+			die("Unable to create '%s.lock': %s", path, strerror(errno));
+		}
 	return fd;
 }
 
-- 
1.6.1.2.351.g032a4.dirty