path: root/lockfile.c
diff options
authorMatthieu Moy <>2009-02-19 12:54:18 (GMT)
committerJunio C Hamano <>2009-02-20 07:22:57 (GMT)
commite43a6fd3e94888d76779ad79fb568ed180e5fcdf (patch)
tree10ebfaf701f9a4b8a0f9f72db9a33bda4c461653 /lockfile.c
parentb452cc16d85ea9de7d3f15c83a917b5534a91120 (diff)
More friendly message when locking the index fails.
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'lockfile.c')
1 files changed, 15 insertions, 1 deletions
diff --git a/lockfile.c b/lockfile.c
index 8589155..8e556ff 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;