From: Dakota Hawkins <email@example.com>
Subject: Issue with global config defaults "user.useConfigOnly = true" + "pull.rebase = preserve" - "user.email"
Date: Fri, 29 Jul 2016 05:17:15 -0400 [thread overview]
Message-ID: <CAG0BQXnVAYdpk9EM_uiD+=UKSKmK=z1YEar5MresTr5XfDCxHw@mail.gmail.com> (raw)
I have a question which may be a bug (I'm a bit skeptical), but here goes:
In my global .gitconfig, I have "user.useConfigOnly = true" and
user.email isn't set there (I prefer to be forced to set it on a
per-repo basis, as I use different emails for work and personal
repos). I ALSO have "pull.rebase = preserve" set.
An example of the problem I have is with tools like golang (I filed an
issue there, they closed it and suggested the problem is with git or
my config: https://github.com/golang/go/issues/16516#issuecomment-235800085)
that use git to pull in package repos without any real user
interaction. When something like that runs a git pull for me (to
update a package repo) my global config makes it try to rebase, which
fails because git doesn't know who I am.
With golang, at least, there's no help setting-up all of its cloned
repos with my user information in local configs, it's a manual step
and I have to repeat it anytime anything decided to clone a new repo
to use as a package, so it's at least persistently frustrating. Hence
the golang bug, which I think is still a bug because they should
handle this better.
In those cases specifically, I never have local commits that differ
from the remote, so a "pull --ff-only" should leave me in the same
state as a "pull --rebase".
Is this a case of rebase trying to make sure it has enough information
for me to be a committer before knowing whether I even need to rewrite
any commits, and could/should that be avoided? Alternatively (or also)
could/should rebase detect that a fast-forward is possible and prefer
to do that instead?
I would not be surprised to learn that there's something I don't know
or haven't considered that explains why those things aren't really
do-able, but if that's the case I'd be interested to know what they
are (I'd love to go back to the golang people and tell them to re-open
my bug because there's nothing wrong with git).
Thanks for your time, and please let me know if you'd like any
- Dakota Hawkins
next reply other threads:[~2016-07-29 9:17 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-29 9:17 Dakota Hawkins [this message]
2016-07-29 17:47 ` Issue with global config defaults "user.useConfigOnly = true" + "pull.rebase = preserve" - "user.email" 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
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).