diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2014-11-17 11:00:02 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2014-11-17 11:00:02 +0100 |
| commit | 9eb902eee03806db5868fc84afb23aa28802e841 (patch) | |
| tree | 9e557ba5b510b2d68046481e8d185321dd88860b /git/refs/log.py | |
| parent | 322db077a693a513e79577a0adf94c97fc2be347 (diff) | |
| parent | ba67e4ff74e97c4de5d980715729a773a48cd6bc (diff) | |
| download | gitpython-9eb902eee03806db5868fc84afb23aa28802e841.tar.gz | |
Merge branch 'firm1-0.3' into 0.3
This includes a few fixes to not break backwards compatiblity
Diffstat (limited to 'git/refs/log.py')
| -rw-r--r-- | git/refs/log.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/git/refs/log.py b/git/refs/log.py index 7249aec5..3bc42801 100644 --- a/git/refs/log.py +++ b/git/refs/log.py @@ -235,7 +235,8 @@ class RefLog(list, Serializable): """Append a new log entry to the revlog at filepath. :param config_reader: configuration reader of the repository - used to obtain - user information. May be None + user information. May also be an Actor instance identifying the committer directly. + May also be None :param filepath: full path to the log file :param oldbinsha: binary sha of the previous commit :param newbinsha: binary sha of the current commit @@ -249,8 +250,9 @@ class RefLog(list, Serializable): raise ValueError("Shas need to be given in binary format") #END handle sha type assure_directory_exists(filepath, is_file=True) - entry = RefLogEntry((bin_to_hex(oldbinsha), bin_to_hex(newbinsha), Actor.committer(config_reader), (int(time.time()), time.altzone), message)) - + committer = isinstance(config_reader, Actor) and config_reader or Actor.committer(config_reader) + entry = RefLogEntry((bin_to_hex(oldbinsha), bin_to_hex(newbinsha), committer, (int(time.time()), time.altzone), message)) + lf = LockFile(filepath) lf._obtain_lock_or_raise() |