Re: defaults for where to merge from

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Feb 28, 2007, 18:06 UTC
Message-ID: <Pine.LNX.4.63.0702281903470.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <45E5B7B4.9080605@lu.unisi.ch>

Hi,

On Wed, 28 Feb 2007, Paolo Bonzini wrote:

Show 9 quoted lines

> 
> > I don't think that you should be forced to do it explicitely. If you 
> > want to merge in another branch, you can do that _explicitely_. So, 
> > defaulting to what most people want anyway is A Good Thing.
> 
> Here is a prototype patch to implement this functionality.  One problem 
> is that config.c does not remove cleaned sections, so after "git-branch 
> -d mybranch" one is left with a useless "[branch "mybranch"]" section in 
> .git/config.  Other than this, it seems to work well in my experiments.

I'd rather remove the complete section (However, that means that you have to introduce a function to do that in config.c) instead of unsetting several hardcoded values.

Also, the second part of your patch would be clearer (methinks) if you replaced the call to get_sha1() with dwim_ref(). You'd get the real refname for free...

Ciao, Dscho