development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 00:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply: add t4137 for submodule updates

Browse source 
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:
Jens Lehmann 2014-06-15 18:59:20 +02:00 committed by Junio C Hamano
parent d78ecca520
commit 558643e1d6
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
t/t4137-apply-submodule.sh Executable file
View 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