# HG changeset patch # User Brendan Cully # Date 1156967710 25200 # Node ID 51b7f792e47344bb8940b9ddc888cd4ad9378f97 # Parent eba7c78c80feb2006f106bbf986caf9ab1fd985a Detect git patches in patchbomb makepatch function diff -r eba7c78c80fe -r 51b7f792e473 hgext/patchbomb.py --- a/hgext/patchbomb.py Wed Aug 30 10:21:02 2006 -0700 +++ b/hgext/patchbomb.py Wed Aug 30 12:55:10 2006 -0700 @@ -140,7 +140,9 @@ if line.startswith('#'): if line.startswith('# Node ID'): node = line.split()[-1] continue - if line.startswith('diff -r'): break + if (line.startswith('diff -r') + or line.startswith('diff --git')): + break desc.append(line) if not node: raise ValueError