diff options
| author | Stefan Beller <sbeller@google.com> | 2017-04-21 10:39:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-23 17:32:39 -0700 |
| commit | 35b96d1de8e795aeac8ec281e88e59f2778335e7 (patch) | |
| tree | fca77e97443fc8540633e1af89169fd210ee185f /t | |
| parent | f2d48994dc11ba367e92c38c8025c3354418145a (diff) | |
| download | git-35b96d1de8e795aeac8ec281e88e59f2778335e7.tar.gz | |
builtin/reset: add --recurse-submodules switchsb/reset-recurse-submodules
git-reset is yet another working tree manipulator, which should
be taught about submodules.
When a user uses git-reset and requests to recurse into submodules,
this will reset the submodules to the object name as recorded in the
superproject, detaching the HEADs.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7112-reset-submodule.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t7112-reset-submodule.sh b/t/t7112-reset-submodule.sh index 2eda6adeb1..f86ccdf215 100755 --- a/t/t7112-reset-submodule.sh +++ b/t/t7112-reset-submodule.sh @@ -5,6 +5,14 @@ test_description='reset can handle submodules' . ./test-lib.sh . "$TEST_DIRECTORY"/lib-submodule-update.sh +KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED=1 +KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1 +KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1 + +test_submodule_switch_recursing "git reset --recurse-submodules --keep" + +test_submodule_forced_switch_recursing "git reset --hard --recurse-submodules" + test_submodule_switch "git reset --keep" test_submodule_switch "git reset --merge" |