https://github.com/git/git
Raw File
Tip revision: df5be6dc3fd18c294ec93a9af0321334e3f92c9c authored by Jeff King on 19 April 2020, 06:34:55 UTC
Git 2.17.5
Tip revision: df5be6d
t4137-apply-submodule.sh
#!/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
back to top