[JGIT PATCH] Fix sort order in GitIndex and mark it as deprecated
From: Robin Rosenberg <hidden>
Date: 2016-06-15 22:46:59
Subsystem:
the rest · Maintainer:
Linus Torvalds
We were using signed comparisons for ordering entries here which is so terribly wrong and sometimes breaks when using non-ascii characters. Due to other mechanisms this went undetected when committing from JGit, because the order in trees were usually corrected, but updating the index from JGit (using GitIndex) and committing from e.g. C Git breaks. Signed-off-by: Robin Rosenberg <redacted> --- .../src/org/spearce/jgit/lib/GitIndex.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) This put GitIndex even higher on the kill list, but as always doing half fixes saves time in the short run.
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/GitIndex.java b/org.spearce.jgit/src/org/spearce/jgit/lib/GitIndex.java
index 21b495a..2ac8ebb 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/lib/GitIndex.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/GitIndex.java@@ -60,6 +60,7 @@ import java.util.Stack; import java.util.TreeMap; +import org.spearce.jgit.dircache.DirCache; import org.spearce.jgit.errors.CorruptObjectException; import org.spearce.jgit.errors.NotSupportedException; import org.spearce.jgit.util.FS;
@@ -85,6 +86,8 @@ * * An index can also contain a tree cache which we ignore for now. We drop the * tree cache when writing the index. + * + * @deprecated Use {@link DirCache} instead. */ public class GitIndex {
@@ -110,7 +113,7 @@ private Map<byte[], Entry> entries = new TreeMap<byte[], Entry>(new Comparator<byte[]>() { public int compare(byte[] o1, byte[] o2) { for (int i = 0; i < o1.length && i < o2.length; ++i) { - int c = o1[i] - o2[i]; + int c = (o1[i] & 0xff) - (o2[i] & 0xff); if (c != 0) return c; }
--
1.6.3.2.199.g7340d