From: Dakota Hawkins <firstname.lastname@example.org>
To: Jeff King <email@example.com>
Cc: Junio C Hamano <firstname.lastname@example.org>,
Johannes Schindelin <email@example.com>,
Subject: Re: Issue with global config defaults "user.useConfigOnly = true" + "pull.rebase = preserve" - "user.email"
Date: Sat, 30 Jul 2016 12:41:04 -0400 [thread overview]
Message-ID: <CAG0BQXmF8Ro5j9oTPMCZwO4gfA+9VdGq3qQZwHJWSCuF_7h3Pg@mail.gmail.com> (raw)
On Fri, Jul 29, 2016 at 6:49 PM, Jeff King <firstname.lastname@example.org> wrote:
> On Fri, Jul 29, 2016 at 03:45:35PM -0700, Junio C Hamano wrote:
>> Jeff King <email@example.com> writes:
>> > TBH, I'm not sure anybody cares that much between the three. Even before
>> > user.useConfigOnly, this could be an issue on machines where the ident
>> > could not be auto-configured, and it seems like nobody ran across it.
>> > It's only the funny interaction with pull.rebase that makes it likely to
>> > come up, so as long as that code path is fixed (one way or another), I
>> > doubt anybody would bring it up again.
>> Yup, I do not think the choice among the three would make all that
>> much difference in practice. If I really have to pick one of them,
>> I think the one in your message I am responding to would make the
>> most sense.
>> The one I sent, which I wrote as a response to some end-user request
>> on the list back then, has been sitting on 'pu' for quite a while
>> because I didn't see a real use or positive support for it, and the
>> only reason why I sent it is because this might be that one
>> real use it wanted to see.
> BTW, I didn't actually test yours, but if we do go that route I suspect
> you can reuse the tests I posted by just replacing "git rebase" with
> "git pull --rebase=<true|preserve> . master".
>> > In some ways this is less convenient, but in some ways it is
>> > more so; the user can then manually commit or even "git
>> > rebase --continue" after setting up their ident (or
>> > providing it as a one-off on the command line).
>> Yup, that is the controvercial bit, and I suspect Dscho's original
>> was siding for the "set up ident first, as you will need it anyway
>> eventually", so I'll let others with viewpoints different from us to
>> chime in first before picking it up.
> Very sensible. Thanks.
All of the options sounds OK to me. I do like the idea of being able
to set it and --continue what I was doing.
Even more convenient than that would be an optional "user.prompt=true"
so the ident check could get what it needs from a simple terminal
prompt, set it in the local config, and try again before returning.
While that would be nice, I've been OK with the current system for my
working repositories for a while. I'm used to having to go set it and
repeat whatever I was trying to do, as it seems like I forget to set
my user.email about half of the time :)
next prev parent reply other threads:[~2016-07-30 16:41 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-29 9:17 Issue with global config defaults "user.useConfigOnly = true" + "pull.rebase = preserve" - "user.email" Dakota Hawkins
2016-07-29 17:47 ` Junio C Hamano
2016-07-29 18:11 ` Jeff King
2016-07-29 18:32 ` Junio C Hamano
2016-07-29 18:39 ` Jeff King
2016-07-29 18:52 ` Jeff King
2016-07-29 18:37 ` Junio C Hamano
2016-07-29 22:31 ` Jeff King
2016-07-29 22:45 ` Junio C Hamano
2016-07-29 22:49 ` Jeff King
2016-07-30 16:41 ` Dakota Hawkins [this message]
2016-08-11 22:44 ` Junio C Hamano
2016-09-09 15:32 ` Johannes Schindelin
2016-09-09 16:09 ` Junio C Hamano
2016-09-09 19:00 ` Junio C Hamano
2016-09-09 23:31 ` Dakota Hawkins
2016-07-29 18:20 ` Junio C Hamano
2016-07-29 18:31 ` Jeff King
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:
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
* 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.
Code repositories for project(s) associated with this public inbox
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 read-only IMAP folder(s) and NNTP newsgroup(s).