• Matthieu Moy's avatar
    lockfile: improve error message when lockfile exists · aed7480c
    Matthieu Moy authored
    A common mistake leading a user to see this message is to launch "git
    commit", let the editor open (and forget about it), and try again to
    The previous message was going too quickly to "a git process crashed"
    and to the advice "remove the file manually".
    This patch modifies the message in two ways: first, it considers that
    "another process is running" is the norm, not the exception, and it
    explicitly hints the user to look at text editors.
    The message is 2 lines longer, but this is not a problem since
    experienced users do not see the message often.
    Helped-by: default avatarMoritz Neeb <lists@moritzneeb.de>
    Signed-off-by: default avatarMatthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
lockfile.c 5.38 KB