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 hvo...@hvoigt.net 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

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

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 wk...@tremily.us 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.name.branch in each of

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 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 wk...@tremily.us 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, 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 'git

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 right

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

2012-11-26 Thread W. Trevor King
submodule update' is given the '--merge', '--rebase' or '--checkout' options. +submodule.name.branch:: + A local branch name for the submodule (to avoid headless operation). + Set with the --local-branch option to git submodule add, or + directly using git config

Re: Git submodule for a local branch?

2012-10-23 Thread W. Trevor King
On Mon, Oct 22, 2012 at 08:37:14AM -0400, W. Trevor King wrote: but cloning a remote repository (vs. checking out a local branch) seems to be baked into the submodule implementation. Perhaps --local would set submodule.$name.url to '.', and ome combination of GIT_WORK_TREE, GIT_DIR, and object

Re: Git submodule for a local branch?

2012-10-23 Thread Jens Lehmann
Am 22.10.2012 14:37, schrieb W. Trevor King: I have a bunch of branches in my repo (a, b, c, …), and I'd like to check them out into subdirectories of another branch (index). My initial inclination was to use something like $ git checkout index $ git branch a b c *

Re: Git submodule for a local branch?

2012-10-23 Thread W. Trevor King
On Tue, Oct 23, 2012 at 10:57:57PM +0200, Jens Lehmann wrote: Am 22.10.2012 14:37, schrieb W. Trevor King: but cloning a remote repository (vs. checking out a local branch) seems to be baked into the submodule implementation. Should I be thinking about generalizing git-submodule.sh, or am

Git submodule for a local branch?

2012-10-22 Thread W. Trevor King
I have a bunch of branches in my repo (a, b, c, …), and I'd like to check them out into subdirectories of another branch (index). My initial inclination was to use something like $ git checkout index $ git branch a b c * index $ git submodule add -b a --reference ./ ./