From 84b8b482a4b86e0db95ca2951f90edf7f5f7ab18 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Wed, 9 Apr 2014 10:41:10 -0500 Subject: [PATCH] Fix parsing of custom committer Other tools use the 'committer' extra field differently, so let's make the parsing more reliable and don't assume it's in a certain format. Reported-by: Kevin Cox Signed-off-by: Felipe Contreras --- git-remote-hg | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/git-remote-hg b/git-remote-hg index 84e3872..79514db 100755 --- a/git-remote-hg +++ b/git-remote-hg @@ -461,8 +461,12 @@ def export_ref(repo, name, kind, head): author = "%s %d %s" % (fixup_user(user), time, gittz(tz)) if 'committer' in extra: - user, time, tz = extra['committer'].rsplit(' ', 2) - committer = "%s %s %s" % (user, time, gittz(int(tz))) + try: + cuser, ctime, ctz = extra['committer'].rsplit(' ', 2) + committer = "%s %s %s" % (cuser, ctime, gittz(int(ctz))) + except ValueError: + cuser = extra['committer'] + committer = "%s %d %s" % (fixup_user(cuser), time, gittz(tz)) else: committer = author