1#!/bin/sh
23
test_description='git am handling submodules'
45
. ./test-lib.sh
6. "$TEST_DIRECTORY"/lib-submodule-update.sh
78
am () {
9git format-patch --stdout --ignore-submodules=dirty "..$1" | git am -
10}
1112
test_submodule_switch "am"
1314
am_3way () {
15git format-patch --stdout --ignore-submodules=dirty "..$1" | git am --3way -
16}
1718
KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
19test_submodule_switch "am_3way"
2021
test_done