[PATCH v6 0/4] submodule update: add --remote for submodule's upstream changes
- From
W. Trevor King <wking@tremily.us>
- Date
- Dec 2, 2012, 03:17 UTC
- Message-ID
- <cover.1354417618.git.wking@tremily.us>
- In-Reply-To
- <20121130032719.GE29257@odin.tremily.us>
From: "W. Trevor King" <wking@tremily.us>
On Thu, Nov 29, 2012 at 10:27:19PM -0500, W. Trevor King wrote:
Show 11 quoted lines
> On Thu, Nov 29, 2012 at 08:11:20PM -0500, Phil Hord wrote: > > I've always felt that the "origin" defaults are broken and are simply > > being ignored because most users do not trip over them. But ISTR that > > submodule commands use the remote indicated by the superproject's > > current remote-tracking configuration, with a fallback to 'origin' if > > there is none. Sort of a "best effort" algorithm, I think. Am I > > remembering that wrong? > > The current code uses a bare "git-fetch". I'm not sure what that > defaults to if you're on a detached head. If it bothers you, I'm fine > adding the submodule.<name>.remote option in v6.
Here it is. Now the remote defaults to $(get_default_remote) with an optional override via submodule.<name>.remote.
Changes since v5:
* New patch 1 for easy config variable setup. * Minor tweaks and rewordings in patches 2 and 3 (v5 patches 1 and 2). * New patch 4 adding submodule.<name>.remote.
I'm fine with squashing patches 1, 2, and 4 together, if people prefer a more compact series.
W. Trevor King (4): submodule: add get_submodule_config helper funtion submodule update: add --remote for submodule's upstream changes submodule add: If --branch is given, record it in .gitmodules submodule update: add submodule.<name>.remote config option
Documentation/config.txt | 8 ++++- Documentation/git-submodule.txt | 27 ++++++++++++++- Documentation/gitmodules.txt | 5 +++ git-submodule.sh | 74 ++++++++++++++++++++++++++++++++++++++--- t/t7400-submodule-basic.sh | 1 + t/t7406-submodule-update.sh | 49 +++++++++++++++++++++++++++ 6 files changed, 158 insertions(+), 6 deletions(-)
-- 1.8.0.4.gf74b0fc.dirty