From 558643e1d67496e72540c61b90d1f38067323fbf Mon Sep 17 00:00:00 2001 From: Jens Lehmann Date: Sun, 15 Jun 2014 18:59:20 +0200 Subject: apply: add t4137 for submodule updates 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 Signed-off-by: Junio C Hamano --- t/t4137-apply-submodule.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100755 t/t4137-apply-submodule.sh (limited to 't/t4137-apply-submodule.sh') diff --git a/t/t4137-apply-submodule.sh b/t/t4137-apply-submodule.sh new file mode 100755 index 0000000000..a9bd40a6d0 --- /dev/null +++ b/t/t4137-apply-submodule.sh @@ -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 -- cgit v1.2.3