From: Felipe Contreras Date: Sun, 4 Nov 2012 02:13:38 +0000 (+0100) Subject: remote-hg: the author email can be null X-Git-Tag: v1.8.1-rc0~5^2~6 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/12ba4bd4ece3b53c810ac72124ff9ed818cffcd6 remote-hg: the author email can be null Like 'Foo <>'. Signed-off-by: Felipe Contreras Signed-off-by: Jeff King --- diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index a9ae8446fb..7929eec30b 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -35,9 +35,9 @@ import urllib # NAME_RE = re.compile('^([^<>]+)') -AUTHOR_RE = re.compile('^([^<>]+?)? ?<([^<>]+)>$') -AUTHOR_HG_RE = re.compile('^(.*?) ?<(.+?)(?:>(.+)?)?$') -RAW_AUTHOR_RE = re.compile('^(\w+) (?:(.+)? )?<(.+)> (\d+) ([+-]\d+)') +AUTHOR_RE = re.compile('^([^<>]+?)? ?<([^<>]*)>$') +AUTHOR_HG_RE = re.compile('^(.*?) ?<(.*?)(?:>(.+)?)?$') +RAW_AUTHOR_RE = re.compile('^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') def die(msg, *args): sys.stderr.write('ERROR: %s\n' % (msg % args))