summaryrefslogtreecommitdiff
path: root/lockfile.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-19 23:44:07 -0800
committerJunio C Hamano <gitster@pobox.com>2009-02-19 23:44:07 -0800
commit8c5b85ce87d15e4db37a6408f03b0eb71dde080e (patch)
tree71b226a7452da6d52d07a60c9957424cd64d0a19 /lockfile.c
parent7d233dea5f4e299fdac8d6cfb610bcd4d60a82b7 (diff)
parente43a6fd3e94888d76779ad79fb568ed180e5fcdf (diff)
downloadgit-8c5b85ce87d15e4db37a6408f03b0eb71dde080e.tar.gz
Merge branch 'maint'
* maint: More friendly message when locking the index fails. Document git blame --reverse. Documentation: Note file formats send-email accepts
Diffstat (limited to 'lockfile.c')
-rw-r--r--lockfile.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/lockfile.c b/lockfile.c
index 021c3375c1..1db1a2fefc 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;
}