diff -r f84036df71ad -r 9e8298a324ac mercurial/patch.py --- a/mercurial/patch.py Sat Jul 27 21:16:12 2013 +0200 +++ b/mercurial/patch.py Sat Jul 27 19:31:14 2013 -0500 @@ -176,7 +176,6 @@ # Not an email, restore parsed headers if any subject = '\n'.join(': '.join(h) for h in msg.items()) + '\n' - gitsendmail = 'git-send-email' in msg.get('X-Mailer', '') # should try to parse msg['Date'] date = None nodeid = None @@ -233,7 +232,7 @@ parents.append(line[9:].lstrip()) elif not line.startswith("# "): hgpatchheader = False - elif line == '---' and gitsendmail: + elif line == '---': ignoretext = True if not hgpatchheader and not ignoretext: cfp.write(line)