From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Jul 2016 17:44:12 +0000 (-0700)
Subject: Merge branch 'sb/clone-shallow-passthru' into maint
X-Git-Tag: v2.9.1~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a88ca99db81b0a5d0f43b57df4a265055d81436;p=thirdparty%2Fgit.git

Merge branch 'sb/clone-shallow-passthru' into maint

Fix an unintended regression in v2.9 that breaks "clone --depth"
that recurses down to submodules by forcing the submodules to also
be cloned shallowly, which many server instances that host upstream
of the submodules are not prepared for.

* sb/clone-shallow-passthru:
  clone: do not let --depth imply --shallow-submodules
---

1a88ca99db81b0a5d0f43b57df4a265055d81436
diff --cc Documentation/git-clone.txt
index 1b15cd7b16,c5a1ce2f59..ec41d3d698
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@@ -189,11 -190,10 +189,10 @@@ objects from the source repository int
  
  --depth <depth>::
  	Create a 'shallow' clone with a history truncated to the
 -	specified number of revisions. Implies `--single-branch` unless
 +	specified number of commits. Implies `--single-branch` unless
  	`--no-single-branch` is given to fetch the histories near the
- 	tips of all branches. This implies `--shallow-submodules`. If
- 	you want to have a shallow superproject clone, but full submodules,
- 	also pass `--no-shallow-submodules`.
+ 	tips of all branches. If you want to clone submodules shallowly,
+ 	also pass `--shallow-submodules`.
  
  --[no-]single-branch::
  	Clone only the history leading to the tip of a single branch,