about summary refs log tree commit diff
path: root/third_party/git/t/t4137-apply-submodule.sh
blob: 07d52625375d4bec97db0a14d74a4fd154681b5e (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
#!/bin/sh

test_description='git apply handling submodules'

. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-submodule-update.sh

apply_index () {
	git diff --ignore-submodules=dirty "..$1" >diff &&
	may_only_be_test_must_fail "$2" &&
	$2 git apply --index diff
}

test_submodule_switch_func "apply_index"

apply_3way () {
	git diff --ignore-submodules=dirty "..$1" >diff &&
	may_only_be_test_must_fail "$2" &&
	$2 git apply --3way diff
}

test_submodule_switch_func "apply_3way"

test_done