mirror of
https://github.com/git/git.git
synced 2024-11-16 06:03:44 +01:00
23e2f388c7
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: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
21 lines
435 B
Bash
Executable file
21 lines
435 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git am handling submodules'
|
|
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-submodule-update.sh
|
|
|
|
am () {
|
|
git format-patch --stdout --ignore-submodules=dirty "..$1" | git am -
|
|
}
|
|
|
|
test_submodule_switch "am"
|
|
|
|
am_3way () {
|
|
git format-patch --stdout --ignore-submodules=dirty "..$1" | git am --3way -
|
|
}
|
|
|
|
KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
|
|
test_submodule_switch "am_3way"
|
|
|
|
test_done
|