diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2014-11-15 16:21:47 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2014-11-15 16:21:47 +0100 |
| commit | 7aba59a2609ec768d5d495dafd23a4bce8179741 (patch) | |
| tree | 9d999b14a7817b1ceeb23ddd1cded446ace9255c /git/objects/util.py | |
| parent | 9c39afa1f85f3293ad2ccef684ff62bf0a36e73c (diff) | |
| parent | ff13922f6cfb11128b7651ddfcbbd5cad67e477f (diff) | |
| download | gitpython-7aba59a2609ec768d5d495dafd23a4bce8179741.tar.gz | |
Merge branch 'johnsca-sf-master' into 0.3
Merge all fixes from https://github.com/gitpython-developers/GitPython/pull/134
Diffstat (limited to 'git/objects/util.py')
| -rw-r--r-- | git/objects/util.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/git/objects/util.py b/git/objects/util.py index 2e44c9c0..cdf72bed 100644 --- a/git/objects/util.py +++ b/git/objects/util.py @@ -167,6 +167,7 @@ def parse_date(string_date): # precompiled regex _re_actor_epoch = re.compile(r'^.+? (.*) (\d+) ([+-]\d+).*$') +_re_only_actor = re.compile(r'^.+? (.*)$') def parse_actor_and_date(line): """Parse out the actor (author or committer) info from a line like:: @@ -174,10 +175,14 @@ def parse_actor_and_date(line): author Tom Preston-Werner <tom@mojombo.com> 1191999972 -0700 :return: [Actor, int_seconds_since_epoch, int_timezone_offset]""" + actor, epoch, offset = '', 0, 0 m = _re_actor_epoch.search(line) - actor, epoch, offset = m.groups() + if m: + actor, epoch, offset = m.groups() + else: + m = _re_only_actor.search(line) + actor = m.group(1) if m else line or '' return (Actor._from_string(actor), int(epoch), utctz_to_altz(offset)) - #} END functions |