Mercurial > hg > mercurial-crew

diff mercurial/patch.py @ 19876:7032dcff290c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Augie Fackler <raf@durin42.com>
date Mon, 07 Oct 2013 17:47:55 -0400
parents c80feeb715d1 c172660eee01
children 1184edaead7a
line wrap: on
line diff
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -14,7 +14,7 @@
 import email.Parser
 
 from i18n import _
-from node import hex, nullid, short
+from node import hex, short
 import base85, mdiff, scmutil, util, diffhelpers, copies, encoding, error
 import context
 
@@ -1662,7 +1662,7 @@
 
     def gitindex(text):
         if not text:
-            return hex(nullid)
+            text = ""
         l = len(text)
         s = util.sha1('blob %d\0' % l)
         s.update(text)