| Index: git_cl.py
|
| diff --git a/git_cl.py b/git_cl.py
|
| index 02b94e3d395b8ca3d56bb6f414c7c7b1ff5e048f..f7c9471202e6dbad5286e3b7c9c6b3acaca0840c 100644
|
| --- a/git_cl.py
|
| +++ b/git_cl.py
|
| @@ -994,7 +994,13 @@ def SendUpstream(parser, args, cmd):
|
| if cmd == 'dcommit' and 'Committed r' in output:
|
| revision = re.match('.*?\nCommitted r(\\d+)', output, re.DOTALL).group(1)
|
| elif cmd == 'push' and retcode == 0:
|
| - revision = output.splitlines()[1].split('\t')[2].split('..')[1]
|
| + m = (re.match(r'.*?([a-f0-9]{7})\.\.([a-f0-9]{7})$', l)
|
| + for l in output.splitlines(False))
|
| + m = filter(None, m)
|
| + if not len(m) == 1:
|
| + DieWithError("Couldn't parse ouput to extract the committed hash:\n%s" %
|
| + output)
|
| + revision = m[0].group(2)
|
| else:
|
| return 1
|
| viewvc_url = settings.GetViewVCUrl()
|
|
|