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 <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lehmann committed
Jun 15, 2014 at 18:59 UTC
558643e1d67496e72540c61b90d1f38067323fbf
1 file changed
+20
t/t4137-apply-submodule.sh
new
+20
@@ -0,0 +1,20 @@
1
+#!/bin/sh
2
+
3
+test_description='git apply handling submodules'
4
+
5
+. ./test-lib.sh
6
+. "$TEST_DIRECTORY"/lib-submodule-update.sh
7
+
8
+apply_index () {
9
+ git diff --ignore-submodules=dirty "..$1" | git apply --index -
10
+}
11
+
12
+test_submodule_switch "apply_index"
13
+
14
+apply_3way () {
15
+ git diff --ignore-submodules=dirty "..$1" | git apply --3way -
16
+}
17
+
18
+test_submodule_switch "apply_3way"
19
+
20
+test_done