• Jens Lehmann's avatar
    pull: add t5572 for submodule updates · 921f50b4
    Jens Lehmann authored
    Test that the pull command updates the work tree as expected (for
    submodule changes which don't result in conflicts) when used without
    arguments or with the '--ff', '--ff-only' and '--no-ff' flag each. Add
    helper functions to reset the branch to be updated to to the current
    HEAD so that pull is doing the transition from HEAD to the given branch.
    
    Set KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES
    and KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR to
    document that pull has the same --no-ff known failures merge has.
    Signed-off-by: default avatarJens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    921f50b4
t5572-pull-submodule.sh 833 Bytes