diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-04-14 18:37:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-14 18:37:12 -0700 |
| commit | bb0b4a9b5e4daf481d48aa0a3e6b806c699e2cd2 (patch) | |
| tree | ed4a4e1cb99967b2940c5d96d03b2bcea734c404 | |
| parent | Start preparing for 2.8.2 (diff) | |
| parent | lockfile: improve error message when lockfile exists (diff) | |
| download | tgif-bb0b4a9b5e4daf481d48aa0a3e6b806c699e2cd2.tar.xz | |
Merge branch 'mm/lockfile-error-message' into maint
* mm/lockfile-error-message:
lockfile: improve error message when lockfile exists
lockfile: mark strings for translation
| -rw-r--r-- | lockfile.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lockfile.c b/lockfile.c index 80d056d2ed..9268cdf325 100644 --- a/lockfile.c +++ b/lockfile.c @@ -149,13 +149,15 @@ static int lock_file_timeout(struct lock_file *lk, const char *path, 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.", + strbuf_addf(buf, _("Unable to create '%s.lock': %s.\n\n" + "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", + strbuf_addf(buf, _("Unable to create '%s.lock': %s"), absolute_path(path), strerror(err)); } |