Merge branch 'sb/submodule-deinit-all'
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 May 2016 21:38:19 +0000 (14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 May 2016 21:38:20 +0000 (14:38 -0700)
Correct faulty recommendation to use "git submodule deinit ." when
de-initialising all submodules, which would result in a strange
error message in a pathological corner case.

* sb/submodule-deinit-all:
submodule deinit: require '--all' instead of '.' for all submodules

1  2 
Documentation/git-submodule.txt
git-submodule.sh
t/t7400-submodule-basic.sh
index 13adebf7b75f2ab122c4d23708493ef098d3548d,ad851838cc96df3e6b920c83f62a02061b8cae80..9226c4380c6c147108af9d38d7f7101c732a2095
@@@ -13,10 -13,10 +13,10 @@@ SYNOPSI
              [--reference <repository>] [--depth <depth>] [--] <repository> [<path>]
  'git submodule' [--quiet] status [--cached] [--recursive] [--] [<path>...]
  'git submodule' [--quiet] init [--] [<path>...]
- 'git submodule' [--quiet] deinit [-f|--force] [--] <path>...
+ 'git submodule' [--quiet] deinit [-f|--force] (--all|[--] <path>...)
  'git submodule' [--quiet] update [--init] [--remote] [-N|--no-fetch]
              [-f|--force] [--rebase|--merge] [--reference <repository>]
 -            [--depth <depth>] [--recursive] [--] [<path>...]
 +            [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]
  'git submodule' [--quiet] summary [--cached|--files] [(-n|--summary-limit) <n>]
              [commit] [--] [<path>...]
  'git submodule' [--quiet] foreach [--recursive] <command>
Simple merge
index 90d80d369c7e9c35f7f86b50e660b95cd279ccaa,cc3cca09f3743eab042e61804048c4b7b9ef6ad8..3570f7bb8c8955a1bf519eda3278392d249e6fd1
@@@ -914,8 -861,9 +918,9 @@@ test_expect_success 'submodule deinit w
                git init &&
                >file &&
                git add file &&
 -              git commit -m "repo should not be empty"
 +              git commit -m "repo should not be empty" &&
-               git submodule deinit .
+               git submodule deinit . &&
+               git submodule deinit --all
        )
  '