You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

24 lines
483 B

#!/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