From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Paolo Bonzini <bonzini@gnu.org>
Subject: Re: [PATCH] branch.autosetupmerge: allow boolean values, or "all"
Date: Sun, 8 Jul 2007 20:15:21 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0707082014140.4248@racer.site> (raw)
In-Reply-To: <7vzm2620wp.fsf@assigned-by-dhcp.cox.net>
Hi,
On Sun, 8 Jul 2007, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> 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
next prev parent reply other threads:[~2007-07-08 19:22 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-06 21:54 [RFC/PATCH] git-branch: default to --track Johannes Schindelin
2007-07-08 8:59 ` Junio C Hamano
2007-07-08 12:41 ` [PATCH] branch.autosetupmerge: allow boolean values, or "all" Johannes Schindelin
2007-07-08 18:41 ` Junio C Hamano
2007-07-08 19:15 ` Johannes Schindelin [this message]
2007-07-09 1:59 ` Paolo Bonzini
2007-07-09 2:27 ` Junio C Hamano
2007-07-09 11:35 ` [PATCH] branch --track: code cleanup and saner handling of local branches Johannes Schindelin
2007-07-09 21:05 ` Junio C Hamano
2007-07-09 21:05 ` Johannes Schindelin
2007-07-09 22:01 ` Junio C Hamano
2007-07-10 3:02 ` [PATCH 1/2] Add for_each_remote() function, and extend remote_find_tracking() Johannes Schindelin
2007-07-10 3:55 ` Daniel Barkalow
2007-07-10 14:11 ` Johannes Schindelin
2007-07-10 5:07 ` Junio C Hamano
2007-07-10 5:23 ` Daniel Barkalow
2007-07-10 17:48 ` [PATCH v2 " Johannes Schindelin
2007-07-10 18:38 ` Junio C Hamano
2007-07-10 19:28 ` Johannes Schindelin
2007-07-10 21:09 ` Daniel Barkalow
2007-07-10 17:50 ` [PATCH v2 2/2] branch --track: code cleanup and saner handling of local branches Johannes Schindelin
2007-07-10 3:05 ` [PATCH " Johannes Schindelin
2007-07-09 11:28 ` [PATCH] branch.autosetupmerge: allow boolean values, or "all" Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0707082014140.4248@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=bonzini@gnu.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).