From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 May 2016 21:38:19 +0000 (-0700)
Subject: Merge branch 'sb/submodule-deinit-all'
X-Git-Tag: v2.9.0-rc0~41
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/21b2e60400754732bd509f393b3368f9fa530602?ds=inline;hp=--cc

Merge branch 'sb/submodule-deinit-all'

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
---

21b2e60400754732bd509f393b3368f9fa530602
diff --cc Documentation/git-submodule.txt
index 13adebf7b7,ad851838cc..9226c4380c
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@@ -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>
diff --cc t/t7400-submodule-basic.sh
index 90d80d369c,cc3cca09f3..3570f7bb8c
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@@ -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
  	)
  '