diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2014-11-17 10:44:31 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2014-11-17 10:44:31 +0100 |
| commit | 9780b7a0f39f66d6e1946a7d109fc49165b81d64 (patch) | |
| tree | 614a4128ab5629594607ae2235dcb15567f64b85 /git/objects/commit.py | |
| parent | 322db077a693a513e79577a0adf94c97fc2be347 (diff) | |
| parent | 3a1e0d7117b9e4ea4be3ef4895e8b2b4937ff98a (diff) | |
| download | gitpython-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/objects/commit.py')
| -rw-r--r-- | git/objects/commit.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git/objects/commit.py b/git/objects/commit.py index d778f2d7..9ec58c52 100644 --- a/git/objects/commit.py +++ b/git/objects/commit.py @@ -258,7 +258,7 @@ class Commit(base.Object, Iterable, Diffable, Traversable, Serializable): finalize_process(proc_or_stream) @classmethod - def create_from_tree(cls, repo, tree, message, parent_commits=None, head=False): + def create_from_tree(cls, repo, tree, message, parent_commits=None, head=False, author=None, committer=None): """Commit the given tree, creating a commit object. :param repo: Repo object the commit should be part of @@ -303,8 +303,8 @@ class Commit(base.Object, Iterable, Diffable, Traversable, Serializable): cr = repo.config_reader() env = os.environ - committer = Actor.committer(cr) - author = Actor.author(cr) + committer = committer or Actor.committer(cr) + author = author or Actor.author(cr) # PARSE THE DATES unix_time = int(time()) |