Hi, On Sun, 8 Jul 2007, Junio C Hamano wrote: > Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > > > > Eh? I did not want this to get applied for my local branches. > > > > That is certainly unexpected and unwelcomed. Alas, I think it is > > one of the consequences of rarely executed (and thus, tested) > > code. > > ... > > +test_expect_success 'autosetupmerge = all' ' > > + git config branch.autosetupmerge true && > > + git branch all1 master && > > + test -z "$(git config branch.all1.merge)" && > > + git config branch.autosetupmerge all && > > + git branch all2 master && > > + test $(git config branch.all2.merge) = refs/heads/master > > +' > > Thanks. > > Having prepared the patch below, I do not think if the original > patch even wanted to have 'all' semantics. The surrounding text > only talks about "off a remote branch" and I strongly suspect > that nobody wanted to do this for a local branch case at all. I remember that the comment was correct for the first few versions. Somehow I missed that change in semantics. Paolo, what was the rationale? Ciao, Dscho - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
