Browse Source

remote-bzr: fix export of utf-8 authors

Reported-by: Joakim Verona <joakim@verona.se>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Felipe Contreras 12 years ago committed by Junio C Hamano
parent
commit
a8c0b74718
  1. 1
      contrib/remote-helpers/git-remote-bzr
  2. 30
      contrib/remote-helpers/test-bzr.sh

1
contrib/remote-helpers/git-remote-bzr

@ -168,6 +168,7 @@ class Parser: @@ -168,6 +168,7 @@ class Parser:
if not m:
return None
_, name, email, date, tz = m.groups()
name = name.decode('utf-8')
committer = '%s <%s>' % (name, email)
tz = int(tz)
tz = ((tz / 100) * 3600) + ((tz % 100) * 60)

30
contrib/remote-helpers/test-bzr.sh

@ -358,4 +358,34 @@ test_expect_success 'strip' ' @@ -358,4 +358,34 @@ test_expect_success 'strip' '
test_cmp expected actual
'

test_expect_success 'export utf-8 authors' '
test_when_finished "rm -rf bzrrepo gitrepo && LC_ALL=C && unset GIT_COMMITTER_NAME" &&

LC_ALL=en_US.UTF-8
export LC_ALL

GIT_COMMITTER_NAME="Grégoire"
export GIT_COMMITTER_NAME

bzr init bzrrepo &&

(
git init gitrepo &&
cd gitrepo &&
echo greg >> content &&
git add content &&
git commit -m one &&
git remote add bzr "bzr::../bzrrepo" &&
git push bzr
) &&

(
cd bzrrepo &&
bzr log | grep "^committer: " > ../actual
) &&

echo "committer: Grégoire <committer@example.com>" > expected &&
test_cmp expected actual
'

test_done

Loading…
Cancel
Save