• Jens Lehmann's avatar
    am: add t4255 for submodule updates · 23e2f388
    Jens Lehmann authored
    Test that the am command updates the work tree as expected (for submodule
    changes which don't result in conflicts). To make that work add two
    helper functions that use format-patch to create the input for am.
    
    Add the KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES
    switch to expect the known failure that --no-ff merges attempt to merge
    the new files in the former submodule directory with those of the removed
    submodule.
    Signed-off-by: default avatarJens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    23e2f388
t4255-am-submodule.sh 435 Bytes