From 0e98548da36df90799f4c069f1d21d6cc5d72210 Mon Sep 17 00:00:00 2001
From: Julien Muchembled <jm@nexedi.com>
Date: Wed, 11 May 2011 16:47:15 +0200
Subject: [PATCH] ERP5VCS: fix committer identity of rebased/merge commit when
 retrying to push

---
 product/ERP5VCS/Git.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/product/ERP5VCS/Git.py b/product/ERP5VCS/Git.py
index 6fea9e603c..af95665166 100644
--- a/product/ERP5VCS/Git.py
+++ b/product/ERP5VCS/Git.py
@@ -339,7 +339,7 @@ class Git(WorkingCopy):
           # TODO: find a solution if there are other local changes
           # TODO: solve conflicts on */bt/revision automatically
           try:
-            self.git(merge, '@{u}')
+            self.git(merge, '@{u}', env=env)
           except GitError, e:
             # XXX: how to know how it failed ?
             try:
-- 
2.30.9