Re: Bug: pull --rebase with é in name

Jeff King [off-list ref] writes:

On Mon, Mar 05, 2012 at 10:59:16AM +0100, René Haber wrote:

quoted

I'm having trouble with the following scenario:
My name contains an é with accent. Having set
git config --global user.name "René Haber"
and several commits with that name in a project.

That should work in general, but...

quoted

git pull --rebase
[...]
/sw/lib/git-core/git-am: line 675: Haber: command not found

The problem lies in .git/rebase-apply/author-script :

GIT_AUTHOR_NAME='Rene'́ Haber
GIT_AUTHOR_EMAIL='rene@habr.de'
GIT_AUTHOR_DATE='@1330931169 +0100'

That's definitely not right.

I can't seem to reproduce it here with a simple test (neither with
"René" in the author name, nor with an author name containing
single-quote). What version of git are you using (it looks like a recent
one, as it has the magic @-date syntax). Have you set
i18n.commitencoding, or are otherwise using an encoding besides utf8? Is
it possible to share the commits that trigger this bug?

Also, can you post a hex dump of the config that defines user.name (try
'xxd ~/.gitconfig'), so we can see the encoding of René?

I find it pretty odd that Git manages to split the ´ from the e, so I'm
wondering if perhaps you are using UTF-8 in NFD or similar.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch

I'm running git 1.7.9.2 from Fink Project on MacOS X 10.6.
The gitconfig in hex is attached.
I'm not using i18n.commitencoding or a charset different from utf8.

Thanks.
René

On Mon, Mar 05, 2012 at 12:42:14PM +0100, René Haber wrote:

I'm running git 1.7.9.2 from Fink Project on MacOS X 10.6.
The gitconfig in hex is attached.

Hmm, looks like pretty standard utf8:

  0000020: 6d65 203d 2052 656e c3a9 2048 6162 6572  me = Ren.. Haber

and the same thing I used in my tests. I tried repeating the test with
v1.7.9.2 on OS X (although my test box is 10.7), and couldn't replicate
it.

Can you show us the commit that causes the problem, as printed by "git
cat-file commit $commit | xxd"? I just want to double-check that there
are no odd bytes there.

Also, what happens if you do:

  sh -c '
    . /sw/lib/git-core/git-sh-setup
     get_author_ident_from_commit $commit
  '

(my theory is that this is the underlying problem in the rebase, and
should show the bug; by narrowing it down, it should make testing a lot
simpler).

-Peff

Jeff King [off-list ref] writes:

On Mon, Mar 05, 2012 at 12:42:14PM +0100, René Haber wrote:

quoted

I'm running git 1.7.9.2 from Fink Project on MacOS X 10.6.
The gitconfig in hex is attached.

Hmm, looks like pretty standard utf8:

  0000020: 6d65 203d 2052 656e c3a9 2048 6162 6572  me = Ren.. Haber

and the same thing I used in my tests. I tried repeating the test with
v1.7.9.2 on OS X (although my test box is 10.7), and couldn't replicate
it.

Can you show us the commit that causes the problem, as printed by "git
cat-file commit $commit | xxd"? I just want to double-check that there
are no odd bytes there.

Also, what happens if you do:

  sh -c '
    . /sw/lib/git-core/git-sh-setup
     get_author_ident_from_commit $commit
  '

(my theory is that this is the underlying problem in the rebase, and
should show the bug; by narrowing it down, it should make testing a lot
simpler).

Hmmm... one place where I have read about this strange "René" -> "Rene'"
conversion is when terminal (console) cannot display unicode, and tries
to show it using ASCII:

  http://stackoverflow.com/a/9430419/46058

But it should not matter if we are writing to file, isn't it?

-- 
Jakub Narębski

sh -c '                                   
   . /sw/lib/git-core/git-sh-setup
    get_author_ident_from_commit 16b94413cbce12531e8f946286851598449d3913
 '
GIT_AUTHOR_NAME='Ren'é Haber
GIT_AUTHOR_EMAIL='rene@habr.de'
GIT_AUTHOR_DATE='@1329212923 +0100'

Commit attached.

The thing is, that this only happens when I do git pull --rebase.
Doing a git rebase -i HEAD~5 or so works.