summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2016-03-01 17:04:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-03-01 18:16:46 (GMT)
commitaed7480ca4c284089a3b332fae770b4056eb08fc (patch)
tree0c19112aae623a2ba9d47b2bb8934ce1f32b6676
parent3030c295baee355d0b454a2d54f295153f8ea6a8 (diff)
downloadgit-aed7480ca4c284089a3b332fae770b4056eb08fc.zip
git-aed7480ca4c284089a3b332fae770b4056eb08fc.tar.gz
git-aed7480ca4c284089a3b332fae770b4056eb08fc.tar.bz2
lockfile: improve error message when lockfile exists
A common mistake leading a user to see this message is to launch "git commit", let the editor open (and forget about it), and try again to commit. The previous message was going too quickly to "a git process crashed" and to the advice "remove the file manually". This patch modifies the message in two ways: first, it considers that "another process is running" is the norm, not the exception, and it explicitly hints the user to look at text editors. The message is 2 lines longer, but this is not a problem since experienced users do not see the message often. Helped-by: Moritz Neeb <lists@moritzneeb.de> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--lockfile.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/lockfile.c b/lockfile.c
index 62583d1..9268cdf 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -150,9 +150,11 @@ void unable_to_lock_message(const char *path, int err, struct strbuf *buf)
{
if (err == EEXIST) {
strbuf_addf(buf, _("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."),
+ "Another git process seems to be running in this repository, e.g.\n"
+ "an editor opened by 'git commit'. Please make sure all processes\n"
+ "are terminated then try again. If it still fails, a git process\n"
+ "may have crashed in this repository earlier:\n"
+ "remove the file manually to continue."),
absolute_path(path), strerror(err));
} else
strbuf_addf(buf, _("Unable to create '%s.lock': %s"),