mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mm/lockfile-error-message' into maint

Browse Source 
* mm/lockfile-error-message:
  lockfile: improve error message when lockfile exists
  lockfile: mark strings for translation
This commit is contained in:
Junio C Hamano
2016-04-14 18:37:12 -07:00
parent 167259bf83 aed7480ca4
commit bb0b4a9b5e
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lockfile.c
View File

@ -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) void unable_to_lock_message(const char *path, int err, struct strbuf *buf)
{ {
if (err == EEXIST) { if (err == EEXIST) {
strbuf_addf(buf, "Unable to create '%s.lock': %s.\n\n" strbuf_addf(buf, _("Unable to create '%s.lock': %s.\n\n"
"If no other git process is currently running, this probably means a\n" "Another git process seems to be running in this repository, e.g.\n"
"git process crashed in this repository earlier. Make sure no other git\n" "an editor opened by 'git commit'. Please make sure all processes\n"
"process is running and remove the file manually to continue.", "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)); absolute_path(path), strerror(err));
} else } else
strbuf_addf(buf, "Unable to create '%s.lock': %s", strbuf_addf(buf, _("Unable to create '%s.lock': %s"),
absolute_path(path), strerror(err)); absolute_path(path), strerror(err));
} }