Re: Issue with global config defaults "user.useConfigOnly = true" + "pull.rebase = preserve" - "user.email"

From: Jeff King <peff@peff.net>
Date: Jul 29, 2016, 18:39 UTC
Message-ID: <20160729183911.GA10268@sigill.intra.peff.net>
In-Reply-To: <xmqq60ronvlj.fsf@gitster.mtv.corp.google.com>

On Fri, Jul 29, 2016 at 11:32:40AM -0700, Junio C Hamano wrote:

> > Wouldn't it be wrong to create a commit with non-config ident when
> > user.useConfigOnly is set, though?
> 
> That is exactly what I was getting at.

Ah, OK, I thought you were trying to explore the opposite direction.

Show 13 quoted lines

> > If the user is doing a one-off thing where they do not care if their
> > crappy, fake ident makes it into a commit object, then the right thing
> > is:
> >
> >   git -c user.useConfigOnly=false pull --rebase
> >
> > or even:
> >
> >   git -c user.email=fake-but-ok@example.com pull --rebase
> 
> Hmm, I somehow had an impression that these git commands are not
> what the end-user runs from the command line, but wrapper tools like
> "go get" has a hardcoded invocation of "git pull".

Yeah, the right person or entity to set those options is the one who knows "the operation I am doing is OK even with bogus ident". I had assumed if "go get" fell under that category, that it should be the one to tell it to git (via the config above).

But I am not really sure that is the case. In general "go get" shouldn't make commits if you aren't doing active work on the repo (AFAIK), and it should just work.

From my limited testing, "git pull --rebase" is perfectly fine. The culprit is "--rebase=preverse", which complains even if it would be a fast-forward.

-Peff