diff options
Diffstat (limited to 'git')
| -rw-r--r-- | git/refs/log.py | 10 | ||||
| -rw-r--r-- | git/test/test_index.py | 5 |
2 files changed, 11 insertions, 4 deletions
diff --git a/git/refs/log.py b/git/refs/log.py index c6f9a218..ec19c1e8 100644 --- a/git/refs/log.py +++ b/git/refs/log.py @@ -39,8 +39,14 @@ class RefLogEntry(tuple): """Representation of ourselves in git reflog format""" act = self.actor time = self.time - return u"{0} {1} {2} <{3}> {4!s} {5}\t{6}\n".format(self.oldhexsha, self.newhexsha, act.name, act.email, - time[0], altz_to_utctz_str(time[1]), self.message).encode("utf-8") + return u"{0} {1} {2} <{3}> {4!s} {5}\t{6}\n".format(self.oldhexsha, + self.newhexsha, + act.name, + act.email, + time[0], + altz_to_utctz_str(time[1]), + self.message).encode("utf-8") + @property def oldhexsha(self): """The hexsha to the commit the ref pointed to before the change""" diff --git a/git/test/test_index.py b/git/test/test_index.py index a0d1ffbc..f7d1cc6a 100644 --- a/git/test/test_index.py +++ b/git/test/test_index.py @@ -10,6 +10,7 @@ from git.test.lib import ( fixture, with_rw_repo ) +from git.util import Actor from git import ( IndexFile, BlobFilter, @@ -444,10 +445,10 @@ class TestIndex(TestBase): assert new_commit.parents[0] == cur_commit assert len(new_commit.parents) == 1 assert cur_head.commit == cur_commit - + # commit with other actor cur_commit = cur_head.commit - + my_author = Actor("An author", "author@example.com") my_committer = Actor("An committer", "committer@example.com") commit_actor = index.commit(commit_message, author=my_author, committer=my_committer) |