Mercurial > hg
diff mercurial/patch.py @ 15089:bfe903b1ff4e
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 12 Sep 2011 23:02:45 -0500 |
parents | 0588fb0e2e8d db0646afb725 |
children | 85322c19c831 |
line wrap: on
line diff
--- a/mercurial/patch.py Sun Sep 11 18:49:54 2011 +0200 +++ b/mercurial/patch.py Mon Sep 12 23:02:45 2011 -0500 @@ -1199,7 +1199,7 @@ m = gitre.match(x) if not m: continue - if gitpatches is None: + if not gitpatches: # scan whole input for git metadata gitpatches = [('a/' + gp.path, 'b/' + gp.path, gp) for gp in scangitpatch(lr, x)]