Return-Path: X-Original-To: apmail-allura-commits-archive@www.apache.org Delivered-To: apmail-allura-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 838A318846 for ; Wed, 27 Jan 2016 23:00:04 +0000 (UTC) Received: (qmail 79669 invoked by uid 500); 27 Jan 2016 23:00:01 -0000 Delivered-To: apmail-allura-commits-archive@allura.apache.org Received: (qmail 79651 invoked by uid 500); 27 Jan 2016 23:00:01 -0000 Mailing-List: contact commits-help@allura.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@allura.apache.org Delivered-To: mailing list commits@allura.apache.org Received: (qmail 79624 invoked by uid 99); 27 Jan 2016 23:00:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Jan 2016 23:00:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 49D3CE00B2; Wed, 27 Jan 2016 23:00:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brondsem@apache.org To: commits@allura.apache.org Date: Wed, 27 Jan 2016 23:00:01 -0000 Message-Id: <2a1b1de44b904eddb9e4b5cbec01d565@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] allura git commit: Encode username for git Repository: allura Updated Branches: refs/heads/master 00a33b7cc -> 481be58b2 Encode username for git Project: http://git-wip-us.apache.org/repos/asf/allura/repo Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/9f560c21 Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/9f560c21 Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/9f560c21 Branch: refs/heads/master Commit: 9f560c2189eda89f0350a0ef822c147637b8ff39 Parents: 00a33b7 Author: Dave Brondsema Authored: Fri Jan 22 16:19:59 2016 -0500 Committer: Dave Brondsema Committed: Wed Jan 27 17:29:10 2016 -0500 ---------------------------------------------------------------------- ForgeGit/forgegit/model/git_repo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/allura/blob/9f560c21/ForgeGit/forgegit/model/git_repo.py ---------------------------------------------------------------------- diff --git a/ForgeGit/forgegit/model/git_repo.py b/ForgeGit/forgegit/model/git_repo.py index 385f440..981a23e 100644 --- a/ForgeGit/forgegit/model/git_repo.py +++ b/ForgeGit/forgegit/model/git_repo.py @@ -128,7 +128,7 @@ class Repository(M.Repository): tmp_repo.git.checkout(mr.target_branch) tmp_repo.git.fetch(mr.downstream_repo.full_fs_path, mr.source_branch) author = h.really_unicode(c.user.display_name or c.user.username) - tmp_repo.git.config('user.name', author) + tmp_repo.git.config('user.name', author.encode('utf8')) tmp_repo.git.config('user.email', '') msg = u'Merge {} branch {} into {}\n\n{}'.format( mr.downstream_repo.url(),