• Junio C Hamano's avatar
    lockfile: LOCK_REPORT_ON_ERROR · 3f061bf5
    Junio C Hamano authored
    The "libify sequencer" topic stopped passing the die_on_error option
    to hold_locked_index(), and this lost an error message from "git
    merge --ff-only $commit" when there are competing updates in
    The command still exits with a non-zero status, but that is not of
    much help for an interactive user.  The last thing the command says
    is "Updating $from..$to".  We used to follow it with a big error
    message that makes it clear that "merge --ff-only" did not succeed.
    What is sad is that we should have noticed this regression while
    reviewing the change.  It was clear that the update to the
    checkout_fast_forward() function made a failing hold_locked_index()
    silent, but the only caller of the checkout_fast_forward() function
    had this comment:
    	    if (checkout_fast_forward(from, to, 1))
        -               exit(128); /* the callee should have complained already */
        +               return -1; /* the callee should have complained already */
    which clearly contradicted the assumption X-<.
    Add a new option LOCK_REPORT_ON_ERROR that can be passed instead of
    LOCK_DIE_ON_ERROR to the hold_lock*() family of functions and teach
    checkout_fast_forward() to use it to fix this regression.
    After going thourgh all calls to hold_lock*() family of functions
    that used to pass LOCK_DIE_ON_ERROR but were modified to pass 0 in
    the "libify sequencer" topic "git show --first-parent 2a4062a4",
    it appears that this is the only one that has become silent.  Many
    others used to give detailed report that talked about "there may be
    competing Git process running" but with the series merged they now
    only give a single liner "Unable to lock ...", some of which may
    have to be tweaked further, but at least they say something, unlike
    the one this patch fixes.
    Reported-by: default avatarRobbie Iannucci <iannucci@google.com>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
lockfile.c 5.56 KB