Re: Moving (renaming) submodules, recipe/script

2013-02-03 Thread W. Trevor King
On Sun, Feb 03, 2013 at 10:36:17PM +, TJ wrote: > I've recently had need to re-arrange more than ten submodules within > a project and discovered there is apparently no easy way to do it. I ran into a similar problem last month, and wrote a similar script [1] ;). There are a few other related

Re: Moving (renaming) submodules, recipe/script

2013-01-08 Thread W. Trevor King
On Tue, Jan 08, 2013 at 06:12:13PM +0100, Jens Lehmann wrote: > Am 08.01.2013 15:32, schrieb W. Trevor King: > > The Git directory for the > > submodule stays in .git/modules/submod-1/ (good), but the worktree in > > .git/modules/submod-1/config still points to ../../../submod-1 (bad). > > You'll

Re: Moving (renaming) submodules, recipe/script

2013-01-08 Thread Jens Lehmann
Am 08.01.2013 15:32, schrieb W. Trevor King: > On Mon, Jan 07, 2013 at 07:59:53AM +0100, Jens Lehmann wrote: >> Am 07.01.2013 02:39, schrieb Jonathan Nieder: >>> (just cc-ing Jens and Peter, who might be interested) >> >> I´m currently working on teaching mv to move submodules and intend >> to send

Re: Moving (renaming) submodules, recipe/script

2013-01-08 Thread W. Trevor King
On Tue, Jan 08, 2013 at 09:32:14AM -0500, W. Trevor King wrote: > Thinking about this a bit more, I'm not clear on how out-of-tree > updates (i.e. worktree in .git/modules/*/config) propogated during > branch checkouts (merges, rebases, etc.). Actually, I don't understand why storing `worktree` in

Re: Moving (renaming) submodules, recipe/script

2013-01-08 Thread W. Trevor King
On Mon, Jan 07, 2013 at 07:59:53AM +0100, Jens Lehmann wrote: > Am 07.01.2013 02:39, schrieb Jonathan Nieder: > > (just cc-ing Jens and Peter, who might be interested) > > I´m currently working on teaching mv to move submodules and intend > to send those patches to the list after finishing submodu

Re: Moving (renaming) submodules, recipe/script

2013-01-07 Thread Junio C Hamano
Jens Lehmann writes: > Right, and me thinks that would warrant a --force option for deinit > to do that even if the submodule contains local changes (which would > make deinit fail otherwise). Probably. > Additionally Michael and Marc spoke up > that they would rather have a --all option to dei

Re: Moving (renaming) submodules, recipe/script

2013-01-07 Thread W. Trevor King
On Mon, Jan 07, 2013 at 07:59:53AM +0100, Jens Lehmann wrote: > I´m currently working on teaching mv to move submodules and intend > to send those patches to the list after finishing submodule deinit. > Please see > https://github.com/jlehmann/git-submod-enhancements/commits/mv-submodules > for t

Re: Moving (renaming) submodules, recipe/script

2013-01-07 Thread Jens Lehmann
Am 07.01.2013 08:44, schrieb Junio C Hamano: > Jens Lehmann writes: > >> Am 07.01.2013 02:39, schrieb Jonathan Nieder: >>> (just cc-ing Jens and Peter, who might be interested) >> >> I´m currently working on teaching mv to move submodules and intend >> to send those patches to the list after fini

Re: Moving (renaming) submodules, recipe/script

2013-01-06 Thread Junio C Hamano
Jens Lehmann writes: > Am 07.01.2013 02:39, schrieb Jonathan Nieder: >> (just cc-ing Jens and Peter, who might be interested) > > I´m currently working on teaching mv to move submodules and intend > to send those patches to the list after finishing submodule deinit. Thanks for a heads-up. As a

Re: Moving (renaming) submodules, recipe/script

2013-01-06 Thread Jens Lehmann
Am 07.01.2013 02:39, schrieb Jonathan Nieder: > (just cc-ing Jens and Peter, who might be interested) I´m currently working on teaching mv to move submodules and intend to send those patches to the list after finishing submodule deinit. Please see https://github.com/jlehmann/git-submod-enhanceme

Re: Moving (renaming) submodules, recipe/script

2013-01-06 Thread Jonathan Nieder
(just cc-ing Jens and Peter, who might be interested) W. Trevor King wrote: > Today I had to move my first submodule, and I discovered that Git's > support for this is pretty limited. There have been a few patch > series attempting to address this [1,2], but none of them seems to > have pushed t

Moving (renaming) submodules, recipe/script

2013-01-06 Thread W. Trevor King
Today I had to move my first submodule, and I discovered that Git's support for this is pretty limited. There have been a few patch series attempting to address this [1,2], but none of them seems to have pushed through into master (although I can't put my finger on a reason for why). There are al