• Andrew Wong's avatar
    rebase: Handle cases where format-patch fails · e481af06
    Andrew Wong authored
    'format-patch' could fail due to reasons such as out of memory. Such
    failures are not detected or handled, which causes rebase to incorrectly
    think that it completed successfully and continue with cleanup. i.e.
    calling move_to_original_branch
    
    Instead of using a pipe, we separate 'format-patch' and 'am' by using an
    intermediate file. This gurantees that we can invoke 'am' with the
    complete input, or not invoking 'am' at all if 'format-patch' failed.
    
    Also remove the use of '&&' at the end of the if-block, and rearrange
    the 'write_basic_state' and 'move_to_original_branch' to make the logic
    flow a bit better and easier to read.
    Signed-off-by: Andrew Wong's avatarAndrew Wong <andrew.kw.w@gmail.com>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    e481af06
git-rebase--am.sh 1.41 KB