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.
21 lines
373 B
21 lines
373 B
11 years ago
|
#!/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
|