ERP5VCS: fix committer identity of rebased/merge commit when retrying to push

0e98548d · Julien Muchembled · 88c0f3cf · 0e98548d
Commit 0e98548d authored May 11, 2011 by Julien Muchembled
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

product/ERP5VCS/Git.py product/ERP5VCS/Git.py +1 -1

No files found.
--- 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: