allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [2/2] allura git commit: Provide an explicit email address for git, else it will error (or older setups could use a $user@$hostname automatically)
Date Wed, 27 Jan 2016 23:00:02 GMT
Provide an explicit email address for git, else it will error (or older setups could use a
$user@$hostname automatically)


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/481be58b
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/481be58b
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/481be58b

Branch: refs/heads/master
Commit: 481be58b2c00509a692522ad4dd4b55e3fb163f0
Parents: 9f560c2
Author: Dave Brondsema <dave@brondsema.net>
Authored: Wed Jan 27 17:59:32 2016 -0500
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Wed Jan 27 17:59:32 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/481be58b/ForgeGit/forgegit/model/git_repo.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/model/git_repo.py b/ForgeGit/forgegit/model/git_repo.py
index 981a23e..7e02905 100644
--- a/ForgeGit/forgegit/model/git_repo.py
+++ b/ForgeGit/forgegit/model/git_repo.py
@@ -129,7 +129,7 @@ class Repository(M.Repository):
             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.encode('utf8'))
-            tmp_repo.git.config('user.email', '')
+            tmp_repo.git.config('user.email', 'allura@localhost')  # a public email alias
could be nice here
             msg = u'Merge {} branch {} into {}\n\n{}'.format(
                 mr.downstream_repo.url(),
                 mr.source_branch,


Mime
View raw message