summaryrefslogtreecommitdiff
path: root/git/index/base.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/index/base.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/index/base.py')
-rw-r--r--git/index/base.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/git/index/base.py b/git/index/base.py
index f11f4492..47c32dc6 100644
--- a/git/index/base.py
+++ b/git/index/base.py
@@ -867,7 +867,7 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable):
return out
- def commit(self, message, parent_commits=None, head=True):
+ def commit(self, message, parent_commits=None, head=True, author=None, committer=None):
"""Commit the current default index file, creating a commit object.
For more information on the arguments, see tree.commit.
@@ -878,7 +878,7 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable):
:return:
Commit object representing the new commit"""
tree = self.write_tree()
- return Commit.create_from_tree(self.repo, tree, message, parent_commits, head)
+ return Commit.create_from_tree(self.repo, tree, message, parent_commits, head, author=author, committer=committer)
@classmethod
def _flush_stdin_and_wait(cls, proc, ignore_stdout=False):