apply: add t4137 for submodule updates
Test that the apply command updates the work tree as expected for the '--index' and the '--3way' options (for submodule changes which don't result in conflicts). Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
d78ecca520
commit
558643e1d6
20
t/t4137-apply-submodule.sh
Executable file
20
t/t4137-apply-submodule.sh
Executable file
@ -0,0 +1,20 @@
|
||||
#!/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" | git apply --index -
|
||||
}
|
||||
|
||||
test_submodule_switch "apply_index"
|
||||
|
||||
apply_3way () {
|
||||
git diff --ignore-submodules=dirty "..$1" | git apply --3way -
|
||||
}
|
||||
|
||||
test_submodule_switch "apply_3way"
|
||||
|
||||
test_done
|
Loading…
Reference in New Issue
Block a user