Mercurial > public > mercurial-scm > hg
diff tests/test-diff-upgrade.t @ 19875:c172660eee01 stable
patch: Fix nullid for binary git diffs (issue4054)
The index for an empty file in git is not 0, but sha-1("blobl 0\0").
author | Johan Bjork <jbjoerk@gmail.com> |
---|---|
date | Mon, 07 Oct 2013 17:47:19 -0400 |
parents | f0d55e1b4855 |
children | 7a9cbb315d84 |
line wrap: on
line diff
--- a/tests/test-diff-upgrade.t Tue Oct 01 16:55:20 2013 -0700 +++ b/tests/test-diff-upgrade.t Mon Oct 07 17:47:19 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