diff options
| author |  Stefan Beller <sbeller@google.com> | 2017-03-14 14:46:41 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-03-16 14:07:16 -0700 |
| commit | 1fc458d958be0e8347d7704933ae647afeabcd91 (patch) | |
| tree | 524d5486e7a1859847c59c5d0bba85428ebc755f /t/t2013-checkout-submodule.sh | |
| parent | entry.c: create submodules when interesting (diff) | |
| download | tgif-1fc458d958be0e8347d7704933ae647afeabcd91.tar.xz | |
builtin/checkout: add --recurse-submodules switch
This exposes a flag to recurse into submodules
in builtin/checkout making use of the code implemented
in prior patches.
A new failure mode is introduced in the submodule
update library, as the directory/submodule conflict
is not solved in prior patches.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2013-checkout-submodule.sh')
| -rwxr-xr-x | t/t2013-checkout-submodule.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh index 6847f75822..e8f70b806f 100755 --- a/t/t2013-checkout-submodule.sh +++ b/t/t2013-checkout-submodule.sh @@ -63,6 +63,12 @@ test_expect_success '"checkout <submodule>" honors submodule.*.ignore from .git/ ! test -s actual ' +KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1 +KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED=1 +test_submodule_switch_recursing "git checkout --recurse-submodules" + +test_submodule_forced_switch_recursing "git checkout -f --recurse-submodules" + test_submodule_switch "git checkout" test_submodule_forced_switch "git checkout -f" |