restore: replace --force with --ignore-unmerged
[git.git] / t / t4137-apply-submodule.sh
bloba9bd40a6d04398234fafb1dda919872a0a33591d
1 #!/bin/sh
3 test_description='git apply handling submodules'
5 . ./test-lib.sh
6 . "$TEST_DIRECTORY"/lib-submodule-update.sh
8 apply_index () {
9 git diff --ignore-submodules=dirty "..$1" | git apply --index -
12 test_submodule_switch "apply_index"
14 apply_3way () {
15 git diff --ignore-submodules=dirty "..$1" | git apply --3way -
18 test_submodule_switch "apply_3way"
20 test_done