summaryrefslogtreecommitdiff
path: root/git/refs/symbolic.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2014-11-17 10:44:31 +0100
committerSebastian Thiel <byronimo@gmail.com>2014-11-17 10:44:31 +0100
commit9780b7a0f39f66d6e1946a7d109fc49165b81d64 (patch)
tree614a4128ab5629594607ae2235dcb15567f64b85 /git/refs/symbolic.py
parent322db077a693a513e79577a0adf94c97fc2be347 (diff)
parent3a1e0d7117b9e4ea4be3ef4895e8b2b4937ff98a (diff)
downloadgitpython-9780b7a0f39f66d6e1946a7d109fc49165b81d64.tar.gz
Merge branch '0.3' of https://github.com/firm1/GitPython into firm1-0.3
Fixed most pressing issues, more to come in next commit as we introduced a regression here. Conflicts: git/objects/commit.py git/refs/log.py git/refs/symbolic.py
Diffstat (limited to 'git/refs/symbolic.py')
-rw-r--r--git/refs/symbolic.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/git/refs/symbolic.py b/git/refs/symbolic.py
index 9f9eb9f5..eb11627d 100644
--- a/git/refs/symbolic.py
+++ b/git/refs/symbolic.py
@@ -355,9 +355,11 @@ class SymbolicReference(object):
:param newbinsha: The sha the ref points to now. If None, our current commit sha
will be used
:return: added RefLogEntry instance"""
- return RefLog.append_entry(self.repo.config_reader(), RefLog.path(self), oldbinsha,
- (newbinsha is None and self.commit.binsha) or newbinsha,
- message)
+ # NOTE: we use the committer of the currently active commit - this should be
+ # correct. See https://github.com/gitpython-developers/GitPython/pull/146
+ return RefLog.append_entry(self.commit.committer, RefLog.path(self), oldbinsha,
+ (newbinsha is None and self.commit.binsha) or newbinsha,
+ message)
def log_entry(self, index):
""":return: RefLogEntry at the given index