diff options
| -rw-r--r-- | lockfile.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lockfile.c b/lockfile.c index 62583d1281..9268cdf325 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"), |