Thread (29 messages) 29 messages, 4 authors, 2016-06-15
STALE3759d

[PATCH 05/14] read-tree: add t1013 for submodule updates

From: Jens Lehmann <hidden>
Date: 2016-06-15 23:01:38
Subsystem: the rest · Maintainer: Linus Torvalds

Test that the read-tree command updates the work tree as expected for
changes which don't result in conflicts with the '-m' and '--reset' flag.

Signed-off-by: Jens Lehmann <redacted>
---
 t/t1013-read-tree-submodule.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100755 t/t1013-read-tree-submodule.sh
diff --git a/t/t1013-read-tree-submodule.sh b/t/t1013-read-tree-submodule.sh
new file mode 100755
index 0000000..20526ae
--- /dev/null
+++ b/t/t1013-read-tree-submodule.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+test_description='read-tree can handle submodules'
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-submodule-update.sh
+
+test_submodule_switch "git read-tree -u -m"
+
+test_submodule_forced_switch "git read-tree -u --reset"
+
+test_done
-- 
2.0.0.275.gc479268
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help