git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [RFC/PATCH] lockfile: improve error message when lockfile exists

From
Duy Nguyen <pclouds@gmail.com>
Date
Feb 29, 2016, 00:35 UTC
Message-ID
<CACsJy8BgqE2iZG6zhSoXsFXq+x9gMBJU8LB8PtJq519nePeVdw@mail.gmail.com>
In-Reply-To
<1456690276-13914-1-git-send-email-Matthieu.Moy@imag.fr>
On Mon, Feb 29, 2016 at 3:11 AM, Matthieu Moy <Matthieu.Moy@imag.fr> wrote:
Show 17 quoted lines
> diff --git a/lockfile.c b/lockfile.c
> index 80d056d..a7d6175 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.\n"
> +                   "Please terminate it (e.g. quit any text editor that git may be\n"
> +                   "waiting for) and try again. If no other git process is running,\n"
> +                   "then a process may have crashed in this repository earlier:\n"
> +                   "remove the file manually to continue.",
>                             absolute_path(path), strerror(err));

i18n police checking in :) This message looks very much translatable. Could you check if that's true while you're touching this code, and if so _() it?

>         } else
>                 strbuf_addf(buf, "Unable to create '%s.lock': %s",

also this one, I think. -- Duy

Previous: Matthieu MoyNext: Matthieu Moy
Message 4 of 6 in “lockfile: improve error message when lockfile exists”
  1. lockfile: improve error message when lockfile existsMatthieu Moy, Feb 28, 2016
  2. Moritz NeebFeb 28, 2016
  3. Matthieu MoyFeb 29, 2016
  4. Duy NguyenFeb 29, 2016
  5. 1/2 lockfile: mark strings for translationMatthieu Moy, Mar 1, 2016
  6. 2/2 lockfile: improve error message when lockfile existsMatthieu Moy, Mar 1, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.