Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Johan Herland
Hi, I just found a failure to checkout a project with submodules where there is no explicit submodule branch configuration, and the submodules happen to not have a master branch: git clone git://gitorious.org/qt/qt5.git qt5 cd qt5 git submodule init qtbase git submodule update In

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread W. Trevor King
On Thu, Mar 27, 2014 at 03:21:49PM +0100, Johan Herland wrote: I just found a failure to checkout a project with submodules where there is no explicit submodule branch configuration, and the submodules happen to not have a master branch: The docs say [1]: A remote branch name for tracking

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread W. Trevor King
On Thu, Mar 27, 2014 at 08:52:08AM -0700, W. Trevor King wrote: Working around that to default to the upstream submodule's HEAD is possible (you can just use --branch HEAD) Actually, this is probably not a good idea. The initial submodule addition works: $ git submodule add -b HEAD

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Junio C Hamano
Johan Herland jo...@herland.net writes: I just found a failure to checkout a project with submodules where there is no explicit submodule branch configuration, and the submodules happen to not have a master branch: git clone git://gitorious.org/qt/qt5.git qt5 cd qt5 git submodule

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Jens Lehmann
Am 27.03.2014 16:52, schrieb W. Trevor King: On Thu, Mar 27, 2014 at 03:21:49PM +0100, Johan Herland wrote: I just found a failure to checkout a project with submodules where there is no explicit submodule branch configuration, and the submodules happen to not have a master branch: The docs

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Jens Lehmann
Am 27.03.2014 18:16, schrieb Junio C Hamano: Johan Herland jo...@herland.net writes: I just found a failure to checkout a project with submodules where there is no explicit submodule branch configuration, and the submodules happen to not have a master branch: git clone

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: Am 27.03.2014 16:52, schrieb W. Trevor King: On Thu, Mar 27, 2014 at 03:21:49PM +0100, Johan Herland wrote: I just found a failure to checkout a project with submodules where there is no explicit submodule branch configuration, and the submodules

Re: [git] Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread W. Trevor King
On Thu, Mar 27, 2014 at 06:31:27PM +0100, Jens Lehmann wrote: Am 27.03.2014 18:16, schrieb Junio C Hamano: Johan Herland jo...@herland.net writes: I just found a failure to checkout a project with submodules where there is no explicit submodule branch configuration, and the submodules

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Junio C Hamano
W. Trevor King wk...@tremily.us writes: On Thu, Mar 27, 2014 at 06:31:27PM +0100, Jens Lehmann wrote: Am 27.03.2014 18:16, schrieb Junio C Hamano: Johan Herland jo...@herland.net writes: I just found a failure to checkout a project with submodules where there is no explicit submodule

Re: Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Heiko Voigt
On Thu, Mar 27, 2014 at 12:39:03PM -0700, Junio C Hamano wrote: W. Trevor King wk...@tremily.us writes: On Thu, Mar 27, 2014 at 06:31:27PM +0100, Jens Lehmann wrote: Am 27.03.2014 18:16, schrieb Junio C Hamano: Johan Herland jo...@herland.net writes: I just found a failure to

submodule.path.branch vs. submodule.name.branch (was: Possible regression in master? (submodules without a master branch).

2014-03-27 Thread W. Trevor King
I'm breaking this off into a sub-thread, so it doesn't distract from the main issue. On Thu, Mar 27, 2014 at 12:39:03PM -0700, Junio C Hamano wrote: There is this bit for update in git-submodule.txt: For updates that clone missing submodules, checkout-mode updates will create submodules

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Jens Lehmann
Am 27.03.2014 19:30, schrieb Junio C Hamano: Jens Lehmann jens.lehm...@web.de writes: Am 27.03.2014 16:52, schrieb W. Trevor King: On Thu, Mar 27, 2014 at 03:21:49PM +0100, Johan Herland wrote: I just found a failure to checkout a project with submodules where there is no explicit submodule

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Jens Lehmann
Am 27.03.2014 21:27, schrieb Heiko Voigt: On Thu, Mar 27, 2014 at 12:39:03PM -0700, Junio C Hamano wrote: W. Trevor King wk...@tremily.us writes: On Thu, Mar 27, 2014 at 06:31:27PM +0100, Jens Lehmann wrote: Am 27.03.2014 18:16, schrieb Junio C Hamano: Johan Herland jo...@herland.net writes:

Re: Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Johan Herland
(Thanks to all of you for picking this up and more or less resolving it while I was away from email for a few hours...) On Thu, Mar 27, 2014 at 9:27 PM, Heiko Voigt hvo...@hvoigt.net wrote: On Thu, Mar 27, 2014 at 12:39:03PM -0700, Junio C Hamano wrote: W. Trevor King wk...@tremily.us writes:

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread Johan Herland
On Thu, Mar 27, 2014 at 11:55 PM, Jens Lehmann jens.lehm...@web.de wrote: Am 27.03.2014 19:30, schrieb Junio C Hamano: - For a repository that does not have that branch thing configured, the doc says that it will default to 'master'. I do not think this was brought up during the

Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread W. Trevor King
On Thu, Mar 27, 2014 at 11:55:21PM +0100, Jens Lehmann wrote: Me thinks that when a superproject doesn't have 'branch' configured and does set 'update' to something other than 'checkout' for a submodule it should better make sure 'master' is a valid branch in there. Everything else sounds like

Re: Re: Possible regression in master? (submodules without a master branch)

2014-03-27 Thread W. Trevor King
On Fri, Mar 28, 2014 at 12:21:23AM +0100, Johan Herland wrote: On Thu, Mar 27, 2014 at 9:27 PM, Heiko Voigt wrote: On Thu, Mar 27, 2014 at 12:39:03PM -0700, Junio C Hamano wrote: There is this bit for update in git-submodule.txt: For updates that clone missing submodules, checkout-mode