]>
Commit | Line | Data |
---|---|---|
1 | #!/bin/sh | |
2 | ||
3 | test_description='git am handling submodules' | |
4 | ||
5 | . ./test-lib.sh | |
6 | . "$TEST_DIRECTORY"/lib-submodule-update.sh | |
7 | ||
8 | am () { | |
9 | git format-patch --stdout --ignore-submodules=dirty "..$1" | git am - | |
10 | } | |
11 | ||
12 | test_submodule_switch "am" | |
13 | ||
14 | am_3way () { | |
15 | git format-patch --stdout --ignore-submodules=dirty "..$1" | git am --3way - | |
16 | } | |
17 | ||
18 | KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1 | |
19 | test_submodule_switch "am_3way" | |
20 | ||
21 | test_done |