From: Felipe Contreras Date: Wed, 28 Aug 2013 19:23:06 GMT Subject: [PATCH 1/8] remote-bzr: fix export of utf-8 authors Message-ID: <1377717793-27170-2-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1377717793-27170-1-git-send-email-felipe.contreras@gmail.com> Reported-by: Joakim Verona Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 1 + contrib/remote-helpers/test-bzr.sh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index c3a3cac..08b0b61 100755 --- a/contrib/remote-helpers/git-remote-bzr +++ b/contrib/remote-helpers/git-remote-bzr @@ -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) diff --git a/contrib/remote-helpers/test-bzr.sh b/contrib/remote-helpers/test-bzr.sh index dce281f..ef8992a 100755 --- a/contrib/remote-helpers/test-bzr.sh +++ b/contrib/remote-helpers/test-bzr.sh @@ -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 " > expected && + test_cmp expected actual +' + test_done -- 1.8.4-fc