From: "Carlos Martín Nieto" <cmn@elego.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, jrnieder@gmail.com
Subject: Re: [PATCH 2/3] branch: suggest how to undo a --set-upstream when given one branch
Date: Wed, 11 Jul 2012 16:24:55 +0200 [thread overview]
Message-ID: <1342016695.6458.14.camel@centaur.cmartin.tk> (raw)
In-Reply-To: <7va9z7ikfi.fsf@alter.siamese.dyndns.org>
On Tue, 2012-07-10 at 10:40 -0700, Junio C Hamano wrote:
> Carlos Martín Nieto <cmn@elego.de> writes:
>
> > This interface is error prone, and a better one (--set-upstream-to)
> > exists. Suggest how to fix a --set-upstream invocation in case the
> > user only gives one argument, which makes it likely that he meant to
> > do the opposite, like with
> >
> > git branch --set-upstream origin/master
> >
> > when they meant one of
> >
> > git branch --set-upstream origin/master master
> > git branch --set-upstream-to origin/master
> >
> > Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
>
> The new code does not seem to depend on the value of "track" (which
> is set by either -t or --set-upstream) in any way. Shouldn't it be
> done only when it is set to track-override?
Yes, yes it should.
>
> Doesn't "git branch [-f] frotz" without any other argument trigger
> the warning?
It does. Oops. Fixed.
cmn
next prev parent reply other threads:[~2012-07-11 14:25 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-10 16:52 [PATCH 0/3] A better way of handling upstream information in git-branch Carlos Martín Nieto
2012-07-10 16:52 ` [PATCH 1/3] branch: introduce --set-upstream-to Carlos Martín Nieto
2012-07-10 17:08 ` Matthieu Moy
2012-07-10 17:26 ` Junio C Hamano
2012-07-10 19:13 ` Jonathan Nieder
2012-07-10 19:49 ` Junio C Hamano
2012-07-10 20:11 ` Jonathan Nieder
2012-07-10 20:49 ` Junio C Hamano
2012-07-10 21:09 ` Jonathan Nieder
2012-07-10 23:13 ` Junio C Hamano
2012-07-10 23:47 ` Jonathan Nieder
2012-07-11 1:20 ` Junio C Hamano
2012-07-11 1:37 ` Jonathan Nieder
2012-07-12 8:41 ` Miles Bader
2012-07-12 16:58 ` Junio C Hamano
2012-07-10 16:53 ` [PATCH 2/3] branch: suggest how to undo a --set-upstream when given one branch Carlos Martín Nieto
2012-07-10 17:20 ` Matthieu Moy
2012-07-11 13:50 ` Carlos Martín Nieto
2012-07-10 17:40 ` Junio C Hamano
2012-07-11 14:24 ` Carlos Martín Nieto [this message]
2012-07-10 19:24 ` Jonathan Nieder
2012-07-10 22:43 ` Junio C Hamano
2012-07-10 23:00 ` Jonathan Nieder
2012-07-11 15:14 ` Carlos Martín Nieto
2012-07-10 16:53 ` [PATCH 3/3] branch: add --unset-upstream option Carlos Martín Nieto
2012-07-10 18:02 ` Junio C Hamano
2012-07-11 14:14 ` Carlos Martín Nieto
2012-07-11 16:53 ` Junio C Hamano
2012-07-12 10:27 ` Carlos Martín Nieto
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=1342016695.6458.14.camel@centaur.cmartin.tk \
--to=cmn@elego.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.