From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Dakota Hawkins <dakotahawkins@gmail.com>,
git@vger.kernel.org
Subject: Re: Issue with global config defaults "user.useConfigOnly = true" + "pull.rebase = preserve" - "user.email"
Date: Fri, 29 Jul 2016 14:52:11 -0400 [thread overview]
Message-ID: <20160729185211.GA5591@sigill.intra.peff.net> (raw)
In-Reply-To: <20160729183911.GA10268@sigill.intra.peff.net>
On Fri, Jul 29, 2016 at 02:39:11PM -0400, Jeff King wrote:
> 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.
That should be preserve, of course. :)
And I think I see what is happening. "preserve" implies
interactive-rebase, which makes an early check that we have valid
committer info, even though we might not actually write any new commits.
So doing this:
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index ded4595..f0f4777 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -1180,9 +1180,6 @@ To continue rebase after editing, run:
;;
esac
-git var GIT_COMMITTER_IDENT >/dev/null ||
- die "$(gettext "You need to set your committer info first")"
-
comment_for_reflog start
if test ! -z "$switch_to"
fixes it for me. I can't figure out if that would have any bad side
effects, though. That check comes from Dscho's original 1b1dce4 (Teach
rebase an interactive mode, 2007-06-25), so there's not much comment on
why it was added specifically.
We would notice the bogus ident later when we actually do try to create
a commit object, but I can guess that this up-front check might give us
a better error message. You get warned up-front, rather than something
like:
Rebasing (1/1)
*** Please tell me who you are.
[...]
fatal: no name was given and auto-detection is disabled
Could not pick 8ebea123853128ca2411b2b449f76a1a4b0d026c
and dumped in the middle of an interactive rebase that you cannot
complete. OTOH, that is how a regular non-interactive merge works. And
if your next step is to set up your ident, then it's natural to do:
git config user.email whatever
git rebase --continue
So I'd lean towards dropping it, but maybe there are other hidden
gotchas.
-Peff
next prev parent reply other threads:[~2016-07-29 18:52 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 [this message]
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
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
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
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 \
--in-reply-to=20160729185211.GA5591@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=dakotahawkins@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).