Re: Re: [PATCH v4 0/4] git-submodule add: Add --local-branch option

2012-11-29 Thread Phil Hord
On Tue, Nov 27, 2012 at 6:28 PM, Heiko Voigt wrote: > > Hi, > > On Tue, Nov 27, 2012 at 02:01:05PM -0500, W. Trevor King wrote: > > On Tue, Nov 27, 2012 at 07:31:25PM +0100, Heiko Voigt wrote: > > The v4 series leaves the remote branch amigious, but it helps you > > point the local branch at the r

Re: [PATCH v4 0/4] git-submodule add: Add --local-branch option (summary)

2012-11-28 Thread W. Trevor King
On Wed, Nov 28, 2012 at 08:09:03AM -0500, W. Trevor King wrote: > * A new 'submodule pull' for tracking the submodule's remote, which is > pulling --ff-only origin/$branch into a whatever state the submodule > is currently in. If any changes were made to submodule $shas, > optionally commit

Re: [PATCH v4 0/4] git-submodule add: Add --local-branch option (summary)

2012-11-28 Thread W. Trevor King
On Tue, Nov 27, 2012 at 09:42:05PM -0500, W. Trevor King wrote: > On Wed, Nov 28, 2012 at 12:28:58AM +0100, Heiko Voigt wrote: > > https://github.com/hvoigt/git/commits/hv/floating_submodules_draft > > I looked over this before, but maybe not thoroughly enough ;). Heiko pointed out that I likely

Re: Re: [PATCH v4 0/4] git-submodule add: Add --local-branch option

2012-11-27 Thread W. Trevor King
On Wed, Nov 28, 2012 at 12:28:58AM +0100, Heiko Voigt wrote: > On Tue, Nov 27, 2012 at 02:01:05PM -0500, W. Trevor King wrote: > > On Tue, Nov 27, 2012 at 07:31:25PM +0100, Heiko Voigt wrote: > > The v4 series leaves the remote branch amigious, but it helps you > > point the local branch at the rig

Re: Re: [PATCH v4 0/4] git-submodule add: Add --local-branch option

2012-11-27 Thread Heiko Voigt
Hi, On Tue, Nov 27, 2012 at 02:01:05PM -0500, W. Trevor King wrote: > On Tue, Nov 27, 2012 at 07:31:25PM +0100, Heiko Voigt wrote: > The v4 series leaves the remote branch amigious, but it helps you > point the local branch at the right hash so that future calls to > > $ git submodule foreach '

Re: [PATCH v4 0/4] git-submodule add: Add --local-branch option

2012-11-27 Thread W. Trevor King
On Tue, Nov 27, 2012 at 07:31:25PM +0100, Heiko Voigt wrote: > On Mon, Nov 26, 2012 at 04:00:15PM -0500, W. Trevor King wrote: > > From: "W. Trevor King" > > > > On Fri, Nov 23, 2012 at 12:54:02PM -0500, W. Trevor King wrote: > > > We could add > > > > > > $ git submodule update --branch > > >

Re: Re: [PATCH v4 0/4] git-submodule add: Add --local-branch option

2012-11-27 Thread Heiko Voigt
Hi, I just realized that I gave you an confusing suggestion. On Tue, Nov 27, 2012 at 07:31:25PM +0100, Heiko Voigt wrote: > if test "$subsha1" != "$sha1" > then > handle_on_demand_fetch_update ... > else > handle_tracked_branch_update ... > fi

Re: [PATCH v4 0/4] git-submodule add: Add --local-branch option

2012-11-27 Thread W. Trevor King
On Tue, Nov 27, 2012 at 07:31:25PM +0100, Heiko Voigt wrote: > I would prefer if we could squash all these commits together into > one since it seems to me one logical step, using the new variable > for update belongs together with its configuration on > initialization. Works for me. I could also

Re: [PATCH v4 0/4] git-submodule add: Add --local-branch option

2012-11-27 Thread Heiko Voigt
Hi, On Mon, Nov 26, 2012 at 04:00:15PM -0500, W. Trevor King wrote: > From: "W. Trevor King" > > On Fri, Nov 23, 2012 at 12:54:02PM -0500, W. Trevor King wrote: > > We could add > > > > $ git submodule update --branch > > > > to checkout the gitlinked SHA1 as submodule..branch in each of > > t

[PATCH v4 0/4] git-submodule add: Add --local-branch option

2012-11-26 Thread W. Trevor King
From: "W. Trevor King" On Fri, Nov 23, 2012 at 12:54:02PM -0500, W. Trevor King wrote: > We could add > > $ git submodule update --branch > > to checkout the gitlinked SHA1 as submodule..branch in each of > the submodules, leaving the submodules on the .gitmodules-configured > branch. Effectiv