X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=lockfile.c;h=8e556ff8c9671864db44dc8b6f4a861bd35142a6;hb=4258c212ca2c3674be4b7e00a19db705eee77a48;hp=8589155532da9eb7f42a1e9c3132fcf42b1b9275;hpb=8c4c286c394cc383577bf884f37a708bba98549e;p=git.git

diff --git a/lockfile.c b/lockfile.c
index 858915553..8e556ff8c 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -158,11 +158,25 @@ static int lock_file(struct lock_file *lk, const char *path, int flags)
 	return lk->fd;
 }
 
+
+NORETURN void unable_to_lock_index_die(const char *path, int err)
+{
+	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(err));
+	} else {
+		die("Unable to create '%s.lock': %s", path, strerror(err));
+	}
+}
+
 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));
+		unable_to_lock_index_die(path, errno);
 	return fd;
 }