[PATCH 02/10] submodule deinit: lose requirement for giving '.'
- From
Stefan Beller <sbeller@google.com>
- Date
- Apr 30, 2016, 00:40 UTC
- Message-ID
- <1461976845-18228-3-git-send-email-sbeller@google.com>
- In-Reply-To
- <1461976845-18228-1-git-send-email-sbeller@google.com>
The discussion in [1] realized that '.' is a faulty suggestion as there is a corner case where it fails:
Show 14 quoted lines
> "submodule deinit ." may have "worked" in the sense that you would > have at least one path in your tree and avoided this "nothing > matches" most of the time. It would have still failed with the > exactly same error if run in an empty repository, i.e. > > $ E=/var/tmp/x/empty && rm -fr "$E" && mkdir -p "$E" && cd "$E" > $ git init > $ rungit v2.6.6 submodule deinit . > error: pathspec '.' did not match any file(s) known to git. > Did you forget to 'git add'? > $ >file && git add file > $ rungit v2.6.6 submodule deinit . > $ echo $? > 0
There is no need to update the documentation as it did not describe the special case '.' to remove all submodules.
[1] http://news.gmane.org/gmane.comp.version-control.git/289535
Signed-off-by: Stefan Beller <sbeller@google.com> --- git-submodule.sh | 5 ----- t/t7400-submodule-basic.sh | 1 - 2 files changed, 6 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh index 82e95a9..d689265 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -428,11 +428,6 @@ cmd_deinit() shift done - if test $# = 0 - then - die "$(eval_gettext "Use '.' if you really want to deinitialize all submodules")" - fi - git submodule--helper list --prefix "$wt_prefix" "$@" | while read mode sha1 stage sm_path do diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 90d80d3..a6231f1 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -948,7 +948,6 @@ test_expect_success 'submodule deinit . deinits all initialized submodules' ' git submodule update --init && git config submodule.example.foo bar && git config submodule.example2.frotz nitfol && - test_must_fail git submodule deinit && git submodule deinit . >actual && test -z "$(git config --get-regexp "submodule\.example\.")" && test -z "$(git config --get-regexp "submodule\.example2\.")" &&
-- 2.8.0.32.g71f8beb.dirty