Re: [PATCH v3] Add default merge options for all branches

From: Jonathan Nieder <jrnieder@gmail.com>
Date: May 3, 2011, 09:49 UTC
Message-ID: <20110503094943.GA32714@elie>
In-Reply-To: <20110503090351.GA27862@elie>

Jonathan Nieder wrote:

> Michael Grubb wrote:

Show 5 quoted lines

>> The approach taken is to make note of whether a branch specific
>> mergeoptions key has been seen and only apply the global value if it
>> hasn't.
>
> What happens if the global value is seen first?

[...]

> With whichever of the changes below make sense,
> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>

Agh, what I meant is "except as noted above". I am still worried about (and have not carefully reviewed) the following case:

	[branch "*"]
		mergeoptions = --foo

	[branch "topic"]
		mergeoptions = --bar

Does it produce different behavior from

	[branch "topic"]
		mergeoptions = --bar

	[branch "*"]
		mergeoptions = --foo

?  If so, is that a good thing, and is it documented?

Sorry for the lack of clarity.