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 3/3] branch: add --unset-upstream option
Date: Wed, 11 Jul 2012 16:14:47 +0200 [thread overview]
Message-ID: <1342016087.6458.10.camel@centaur.cmartin.tk> (raw)
In-Reply-To: <7v629vijf2.fsf@alter.siamese.dyndns.org>
On Tue, 2012-07-10 at 11:02 -0700, Junio C Hamano wrote:
> Carlos Martín Nieto <cmn@elego.de> writes:
>
> > We have ways of setting the upstream information, but if we want to
> > unset it, we need to resort to modifying the configuration manually.
> >
> > Teach branch an --unset-upstream option that unsets this information.
> >
> > ---
> >
> > create_branch() uses install_branch_config() which may also set
> > branch.foo.rebase, so this version might leave some configuration
> > laying around.
> >
> > I wonder if deleting the whole branch.foo section would be better. Can
> > we be sure that nothing else shows up there?
>
> "branch.foo.$unknown" may not be related to upstream at all, so that
> will not fly. Besides, we already have unknown=description, no?
Ah yes, that exists. I've added a bit of code to also remove
branch.foo.rebase, which I'd also consider to be part of the upstream
information.
cmn
next prev parent reply other threads:[~2012-07-11 14:14 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
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 [this message]
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=1342016087.6458.10.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 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).