https://github.com/git/git
Raw File
Tip revision: d62dad7a7dca3f6a65162bf0e52cdf6927958e78 authored by Junio C Hamano on 07 February 2019, 05:30:09 UTC
Git 2.21-rc0
Tip revision: d62dad7
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