[PATCH] submodule deinit: require '--all' instead of '.' for all submodules
- From
Stefan Beller <sbeller@google.com>
- Date
- May 3, 2016, 22:11 UTC
- Message-ID
- <1462313499-6760-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
So instead of a path spec add a parameter '--all' to deinit all submodules and add a test to check for the corner case of an empty repository.
There is no need to update the documentation as it did not describe the special case '.' to remove all submodules.
The code only needs to learn about the '--all' parameter and doesn't require further changes as `git submodule--helper list "$@"` will list all submodules in that case.
[1] http://news.gmane.org/gmane.comp.version-control.git/289535
Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Stefan Beller <sbeller@google.com> ---
This is the result of the discussion, I would think.
I developed it on top of
"submodule deinit test: fix broken && chain in subshell"
on top of 2a4c8c36a7f6, 2016-03-24, Merge branch
'sb/submodule-module-list-pathspec-fix'
but I think this would rather go in as a new feature, not on top
of a bugfix topic, so I think this could go on origin/master ?Thanks, Stefan
git-submodule.sh | 12 ++++++++++-- t/t7400-submodule-basic.sh | 4 ++++ 2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh index 43c68de..301cd0d 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -521,6 +521,7 @@ cmd_init() cmd_deinit() { # parse $args after "submodule ... deinit". + deinit_all= while test $# -ne 0 do case "$1" in @@ -530,6 +531,9 @@ cmd_deinit() -q|--quiet) GIT_QUIET=1 ;; + -a|--all) + deinit_all=t + ;; --) shift break @@ -544,9 +548,13 @@ cmd_deinit() shift done - if test $# = 0 + if test -n "$deinit_all" && test "$#" -ne 0 + then + die "$(eval_gettext "'--all' is incompatible with pathspec arguments")" + fi + if test $# = 0 && test -z "$deinit_all" then - die "$(eval_gettext "Use '.' if you really want to deinitialize all submodules")" + die "$(eval_gettext "Use '--all' if you really want to deinitialize all submodules")" fi git submodule--helper list --prefix "$wt_prefix" "$@" | diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index cf06b2f..a5b0dec 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -11,6 +11,10 @@ subcommands of git submodule. . ./test-lib.sh +test_expect_success 'submodule deinit works on empty repository' ' + git submodule deinit --all +' + test_expect_success 'setup - initial commit' ' >t && git add t &&
-- 2.8.0.rc4.10.geb92688.dirty