Skip to content

erp5-Boxiang
erp5-Boxiang
Commit 0e98548d authored by Julien Muchembled's avatar Julien Muchembled
Browse files
Options

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

parent 88c0f3cf
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
product/ERP5VCS/Git.py
View file @ 0e98548d
...@@ -339,7 +339,7 @@ class Git(WorkingCopy): ...@@ -339,7 +339,7 @@ class Git(WorkingCopy):
# TODO: find a solution if there are other local changes # TODO: find a solution if there are other local changes
# TODO: solve conflicts on */bt/revision automatically # TODO: solve conflicts on */bt/revision automatically
try: try:
self.git(merge, '@{u}') self.git(merge, '@{u}', env=env)
except GitError, e: except GitError, e:
# XXX: how to know how it failed ? # XXX: how to know how it failed ?
try: try:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7