From: Carlos Martín Nieto <cmn@elego.de>
Date: Wed, 11 Jul 2012 14:14:47 GMT
Subject: Re: [PATCH 3/3] branch: add --unset-upstream option
Message-ID: <1342016087.6458.10.camel@centaur.cmartin.tk>
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