Re: Git Rebase blows away GIT_AUTHOR_NAME

From: Jeff King <peff@peff.net>
Date: Jan 12, 2011, 18:21 UTC
Message-ID: <20110112182150.GC31747@sigill.intra.peff.net>
In-Reply-To: <AANLkTinMX0yEPvSc-c=96R42SbFZTjW5Mnveuxk3ZHS=@mail.gmail.com>

On Wed, Jan 12, 2011 at 09:15:41AM -0700, JT Olds wrote:

Show 7 quoted lines

> On every fresh install of Ubuntu that I have used (by default, I use
> ecryptfs for my home directory, which of course has its own set of
> silly Git errors right now), when I clone from a remote repository,
> have changes local to me, and changes on the remote repository, do
> 'git pull --rebase', occasionally my GIT_AUTHOR_NAME gets set to my
> GIT_AUTHOR_EMAIL on my changes that get applied on top of the remote
> changes.

Weird. I have never heard of anything like it.

Some things off the top of my head: Does your GIT_AUTHOR_NAME or GIT_AUTHOR_EMAIL contain any odd characters that might confuse a parser? Do you do anything special with setting up those environment variables in your shell (e.g., in a .bashrc or .profile; those files _shouldn't_ be read by a non-interactive shell, but it's something to investigate)? For that matter, how do you set up your identity in general (by environment, or in ~/.gitconfig, or a local .git/config in each repo), and what does it contain?

Can you try running this in a repo that's giving you problems:

  . git-sh-setup
  git log --format=%H --author=your.name |
  while read rev; do
    get_author_ident_from_commit $rev
    git format-patch -1 --stdout $rev |
      git mailinfo /dev/null /dev/null
  done | less

and check that the output looks sane? I want to make sure there's nothing in your commits that is confusing our parser.

If that doesn't turn up anything, I think the next thing to try would be making a script that reproduces the problem for you, and see if I can reproduce it here.

-Peff