]> git.ipfire.org Git - thirdparty/git.git/blob - t/t4137-apply-submodule.sh
Merge branch 'sb/userdiff-dts'
[thirdparty/git.git] / t / t4137-apply-submodule.sh
1 #!/bin/sh
2
3 test_description='git apply handling submodules'
4
5 . ./test-lib.sh
6 . "$TEST_DIRECTORY"/lib-submodule-update.sh
7
8 apply_index () {
9 git diff --ignore-submodules=dirty "..$1" | git apply --index -
10 }
11
12 test_submodule_switch "apply_index"
13
14 apply_3way () {
15 git diff --ignore-submodules=dirty "..$1" | git apply --3way -
16 }
17
18 test_submodule_switch "apply_3way"
19
20 test_done