From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 16 Dec 2010 20:57:15 +0000 (-0800)
Subject: Merge branch 'jl/fetch-submodule-recursive'
X-Git-Tag: v1.7.4-rc0~31
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4bb4d30095fbc3b1689cc656e71f6a51e43fbd69;p=git.git

Merge branch 'jl/fetch-submodule-recursive'

* jl/fetch-submodule-recursive:
  fetch_populated_submodules(): document dynamic allocation
  Submodules: Add the "fetchRecurseSubmodules" config option
  Add the 'fetch.recurseSubmodules' config setting
  fetch/pull: Add the --recurse-submodules option

Conflicts:
	builtin/fetch.c
---

4bb4d30095fbc3b1689cc656e71f6a51e43fbd69
diff --cc Documentation/fetch-options.txt
index 678675ccd,99e72d912..695696da1
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@@ -61,10 -58,18 +61,21 @@@ ifndef::git-pull[
  	objects reachable from the branch heads that are being
  	tracked will not be fetched by this mechanism.  This
  	flag lets all tags and their associated objects be
 -	downloaded.
 +	downloaded. The default behavior for a remote may be
 +	specified with the remote.<name>.tagopt setting. See
 +	linkgit:git-config[1].
 +endif::git-pull[]
+ 
+ --[no-]recurse-submodules::
+ 	This option controls if new commits of all populated submodules should
+ 	be fetched too (see linkgit:git-config[1] and linkgit:gitmodules[5]).
+ 
+ ifndef::git-pull[]
+ --submodule-prefix=<path>::
+ 	Prepend <path> to paths printed in informative messages
+ 	such as "Fetching submodule foo".  This option is used
+ 	internally when recursing over submodules.
+ endif::git-pull[]
  
  -u::
  --update-head-ok::
diff --cc builtin/fetch.c
index 6bcce55c0,75032a507..357f3cdbb
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@@ -51,7 -60,10 +59,10 @@@ static struct option builtin_fetch_opti
  	OPT_SET_INT('n', NULL, &tags,
  		    "do not fetch all tags (--no-tags)", TAGS_UNSET),
  	OPT_BOOLEAN('p', "prune", &prune,
 -		    "prune tracking branches no longer on remote"),
 +		    "prune remote-tracking branches no longer on remote"),
+ 	OPT_SET_INT(0, "recurse-submodules", &recurse_submodules,
+ 		    "control recursive fetching of submodules",
+ 		    RECURSE_SUBMODULES_ON),
  	OPT_BOOLEAN(0, "dry-run", &dry_run,
  		    "dry run"),
  	OPT_BOOLEAN('k', "keep", &keep, "keep downloaded pack"),