Moritz Neeb <lists@xxxxxxxxxxxxx> writes:
> On 02/28/2016 09:11 PM, Matthieu Moy wrote:
>
>> This patch was written after seen one more time a student panicked
>> because he had a "git commit" backgrounded.
>
> I think git commit is almost the only case where this would happen.
Right. It's not the only case when Git launches an editor, but probably
the only one when it does so keeping a lock.
> If the goal is have it shorter, then the editor example could be boiled down to
> something like "e.g. a commit". But then it is less clear on what the
> necessary action would be.
Maybe just ""e.g. an editor opened by git" -> ""e.g. an editor opened by
git commit"?
> --- 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"
> + "e.g. an editor opened by git. 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.",
I like your version better than mine indeed.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html