diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2014-06-15 16:59:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-14 19:06:15 (GMT) |
| commit | 48294e1ddb4e31531d3025da0a6bed54cc4b72ac (patch) | |
| tree | 88bd20a4239a9f0150566e9d20f9331c6647e5a3 /t | |
| parent | 558643e1d67496e72540c61b90d1f38067323fbf (diff) | |
| download | git-48294e1ddb4e31531d3025da0a6bed54cc4b72ac.zip git-48294e1ddb4e31531d3025da0a6bed54cc4b72ac.tar.gz git-48294e1ddb4e31531d3025da0a6bed54cc4b72ac.tar.bz2 | |
read-tree: add t1013 for submodule updates
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 <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1013-read-tree-submodule.sh | 12 |
1 files changed, 12 insertions, 0 deletions
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 |