allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [1/2] allura git commit: Encode username for git
Date Wed, 27 Jan 2016 23:00:01 GMT
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 <dave@brondsema.net>
Authored: Fri Jan 22 16:19:59 2016 -0500
Committer: Dave Brondsema <dave@brondsema.net>
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(),


Mime
View raw message