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

3 messages, 3 authors, 2016-06-15 · open the first message on its own page

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

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:46:07

Matthieu Moy [off-list ref] writes:

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 <redacted>
---
Oops, I hadn't noticed, but the previous version triggered a warning
because of lack of braces on the if. Sorry.

Perhaps it is a good idea to introduce

NORETURN void unable_to_lock_index_die(const char *path, int err)
{
	if (err == EEXIST)
	        die(...);
 	else
        	die(...);
}

in lockfile.c and call it from these two places you are touching?

quoted hunk

 builtin-update-index.c |   12 ++++++++++--
 lockfile.c             |   13 +++++++++++--
 2 files changed, 21 insertions(+), 4 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..c812596 100644
--- a/lockfile.c
+++ b/lockfile.c

@@ -158,8 +158,17 @@ static int lock_file(struct lock_file *lk, const char *path, int flags)
 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 (fd < 0 && (flags & LOCK_DIE_ON_ERROR)) {
+		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.g80eb2.dirty

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

From: Matthieu Moy <hidden>
Date: 2016-06-15 22:46:14

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 <redacted>
---

Perhaps it is a good idea to introduce

NORETURN void unable_to_lock_index_die(const char *path, int err)
{
	if (err == EEXIST)
	        die(...);
 	else
        	die(...);
}

in lockfile.c and call it from these two places you are touching?

Here it is!

 builtin-update-index.c |    3 +--
 cache.h                |    1 +
 lockfile.c             |   16 +++++++++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/builtin-update-index.c b/builtin-update-index.c
index 5604977..dd43d5b 100644
--- a/builtin-update-index.c
+++ b/builtin-update-index.c

@@ -742,8 +742,7 @@ 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));
+			unable_to_lock_index_die(get_index_file(), lock_error);
 		}
 		if (write_cache(newfd, active_cache, active_nr) ||
 		    commit_locked_index(lock_file))

diff --git a/cache.h b/cache.h
index 37dfb1c..bb5a190 100644
--- a/cache.h
+++ b/cache.h

@@ -484,6 +484,7 @@ struct lock_file {
 };
 #define LOCK_DIE_ON_ERROR 1
 #define LOCK_NODEREF 2
+extern NORETURN void unable_to_lock_index_die(const char *path, int err);
 extern int hold_lock_file_for_update(struct lock_file *, const char *path, int);
 extern int hold_lock_file_for_append(struct lock_file *, const char *path, int);
 extern int commit_lock_file(struct lock_file *);

diff --git a/lockfile.c b/lockfile.c
index 021c337..1db1a2f 100644
--- a/lockfile.c
+++ b/lockfile.c

@@ -155,11 +155,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;
 }

-- 
1.6.2.rc1.14.g7f87d

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

From: Sverre Rabbelier <hidden>
Date: 2016-06-15 22:46:14

Heya,

On Thu, Feb 19, 2009 at 13:54, Matthieu Moy [off-list ref] wrote:

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.

Surely we need a 'git cleanup' which will attempt to clean up such
mess, fail miserably most of the time and might even corrupt your
repository further! Oh wait, wrong VCS...

-- 
Cheers,

Sverre Rabbelier

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help