#!/bin/sh global test_description := ''merge can handle submodules'' source ./test-lib.sh source "$TEST_DIRECTORY"/lib-submodule-update.sh # merges without conflicts test_submodule_switch "git merge" test_submodule_switch "git merge --ff" test_submodule_switch "git merge --ff-only" global KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR := '1' global KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES := '1' test_submodule_switch "git merge --no-ff" test_done (CommandList children: [ (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:test_description) op: Equal rhs: {(SQ <"merge can handle submodules">)} spids: [4] ) ] spids: [4] ) (C {(.)} {(./test-lib.sh)}) (C {(.)} {(DQ ($ VSub_Name "$TEST_DIRECTORY")) (/lib-submodule-update.sh)}) (C {(test_submodule_switch)} {(DQ ("git merge"))}) (C {(test_submodule_switch)} {(DQ ("git merge --ff"))}) (C {(test_submodule_switch)} {(DQ ("git merge --ff-only"))}) (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR) op: Equal rhs: {(1)} spids: [46] ) ] spids: [46] ) (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES) op: Equal rhs: {(1)} spids: [49] ) ] spids: [49] ) (C {(test_submodule_switch)} {(DQ ("git merge --no-ff"))}) (C {(test_done)}) ] )