# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1381182475 14400
# Node ID 7032dcff290ce49c9e2c0a78ddc003e1520cfcce
# Parent  5836edcbdc2e4c5bd97a50db512191b98c2d69d8# Parent  c172660eee01af28b8f843a9f7a568a4de5bb084
merge with stable

diff -r 5836edcbdc2e -r 7032dcff290c mercurial/patch.py
--- a/mercurial/patch.py	Thu Oct 03 19:41:25 2013 +0200
+++ b/mercurial/patch.py	Mon Oct 07 17:47:55 2013 -0400
@@ -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)
diff -r 5836edcbdc2e -r 7032dcff290c tests/test-diff-upgrade.t
--- a/tests/test-diff-upgrade.t	Thu Oct 03 19:41:25 2013 +0200
+++ b/tests/test-diff-upgrade.t	Mon Oct 07 17:47:55 2013 -0400
@@ -183,7 +183,7 @@
   % git=auto: git diff for newbinary
   diff --git a/newbinary b/newbinary
   new file mode 100644
-  index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d
+  index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f76dd238ade08917e6712764a16a22005a50573d
   GIT binary patch
   literal 1
   Ic${MZ000310RR91
@@ -200,7 +200,7 @@
   % git=auto: git diff for rmbinary
   diff --git a/rmbinary b/rmbinary
   deleted file mode 100644
-  index f76dd238ade08917e6712764a16a22005a50573d..0000000000000000000000000000000000000000
+  index f76dd238ade08917e6712764a16a22005a50573d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
   GIT binary patch
   literal 0
   Hc$@<O00001
diff -r 5836edcbdc2e -r 7032dcff290c tests/test-git-export.t
--- a/tests/test-git-export.t	Thu Oct 03 19:41:25 2013 +0200
+++ b/tests/test-git-export.t	Mon Oct 07 17:47:55 2013 -0400
@@ -113,7 +113,7 @@
   $ cat b.diff
   diff --git a/binfile.bin b/binfile.bin
   new file mode 100644
-  index 0000000000000000000000000000000000000000..37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9
+  index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9
   GIT binary patch
   literal 593
   zc$@)I0<QguP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00009a7bBm000XU