Re: [RFC] submodule: change submodule..branch default from master to HEAD

2014-03-31 Thread Junio C Hamano
Jens Lehmann writes: > I'd prefer a solution that doesn't change any defaults for the > checkout use case (again). Maybe it is a better route to revert > this series, then add tests describing the current behavior for > checkout submodules as a next step before adding the branch mode > for rebase

Re: [RFC] submodule: change submodule..branch default from master to HEAD

2014-03-31 Thread W. Trevor King
On Mon, Mar 31, 2014 at 09:35:07PM +0200, Jens Lehmann wrote: > Am 28.03.2014 04:36, schrieb W. Trevor King: > > The main drawback to this approach is that we're changing a default, > > but I agree with John's: > > > > On Fri, Mar 28, 2014 at 12:21:23AM +0100, Johan Herland wrote: > >> I expect in

Re: [RFC] submodule: change submodule..branch default from master to HEAD

2014-03-31 Thread Jens Lehmann
Am 28.03.2014 04:36, schrieb W. Trevor King: > gitmodule(5) mentioned 'master' as the default remote branch, but > folks using checkout-style updates are unlikely to care which upstream > branch their commit comes from (they only care that the clone fetches > that commit). If they haven't set subm

Re: [RFC] submodule: change submodule..branch default from master to HEAD

2014-03-31 Thread Jens Lehmann
Am 28.03.2014 18:10, schrieb W. Trevor King: > On Fri, Mar 28, 2014 at 05:57:50PM +0100, Jens Lehmann wrote: >> Am 28.03.2014 04:58, schrieb W. Trevor King: >>> On Thu, Mar 27, 2014 at 08:52:55PM -0700, W. Trevor King wrote: No the remote branch is in the upstream subproject. I suppose I mean

Re: [RFC] submodule: change submodule..branch default from master to HEAD

2014-03-28 Thread Junio C Hamano
Jens Lehmann writes: > Am 28.03.2014 04:58, schrieb W. Trevor King: >> On Thu, Mar 27, 2014 at 08:52:55PM -0700, W. Trevor King wrote: >>> On Thu, Mar 27, 2014 at 11:43:47PM -0400, Eric Sunshine wrote: On Thu, Mar 27, 2014 at 11:36 PM, W. Trevor King wrote: > submodule..branch:: >

Re: [RFC] submodule: change submodule..branch default from master to HEAD

2014-03-28 Thread W. Trevor King
On Fri, Mar 28, 2014 at 05:57:50PM +0100, Jens Lehmann wrote: > Am 28.03.2014 04:58, schrieb W. Trevor King: > > On Thu, Mar 27, 2014 at 08:52:55PM -0700, W. Trevor King wrote: > >> No the remote branch is in the upstream subproject. I suppose I meant > >> “the submodule's remote-tracking branch f

Re: [RFC] submodule: change submodule..branch default from master to HEAD

2014-03-28 Thread Jens Lehmann
Am 28.03.2014 04:58, schrieb W. Trevor King: > On Thu, Mar 27, 2014 at 08:52:55PM -0700, W. Trevor King wrote: >> On Thu, Mar 27, 2014 at 11:43:47PM -0400, Eric Sunshine wrote: >>> On Thu, Mar 27, 2014 at 11:36 PM, W. Trevor King wrote: submodule..branch:: A remote branch name f

Re: [RFC] submodule: change submodule..branch default from master to HEAD

2014-03-27 Thread W. Trevor King
On Thu, Mar 27, 2014 at 08:52:55PM -0700, W. Trevor King wrote: > On Thu, Mar 27, 2014 at 11:43:47PM -0400, Eric Sunshine wrote: > > On Thu, Mar 27, 2014 at 11:36 PM, W. Trevor King wrote: > > > submodule..branch:: > > > A remote branch name for tracking updates in the upstream > > > sub

Re: [RFC] submodule: change submodule..branch default from master to HEAD

2014-03-27 Thread W. Trevor King
On Thu, Mar 27, 2014 at 11:43:47PM -0400, Eric Sunshine wrote: > On Thu, Mar 27, 2014 at 11:36 PM, W. Trevor King wrote: > > submodule..branch:: > > A remote branch name for tracking updates in the upstream submodule. > > - If the option is not specified, it defaults to 'master'. S

Re: [RFC] submodule: change submodule..branch default from master to HEAD

2014-03-27 Thread Eric Sunshine
On Thu, Mar 27, 2014 at 11:36 PM, W. Trevor King wrote: > gitmodule(5) mentioned 'master' as the default remote branch, but > folks using checkout-style updates are unlikely to care which upstream > branch their commit comes from (they only care that the clone fetches > that commit). If they have

[RFC] submodule: change submodule..branch default from master to HEAD

2014-03-27 Thread W. Trevor King
gitmodule(5) mentioned 'master' as the default remote branch, but folks using checkout-style updates are unlikely to care which upstream branch their commit comes from (they only care that the clone fetches that commit). If they haven't set submodule..branch, it makes more sense to mirror 'git clo