From: Grzegorz Kossakowski <grek@xxxxxxxxxx>
When mode's object type of entry equals to Constants.OBJ_BAD it's a sign
of bad (uninitialized) state of an entry and not of problems with merging.
Signed-off-by: Grzegorz Kossakowski <grek@xxxxxxxxxx>
---
.../org/spearce/jgit/dircache/DirCacheTree.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/org.spearce.jgit/src/org/spearce/jgit/dircache/DirCacheTree.java b/org.spearce.jgit/src/org/spearce/jgit/dircache/DirCacheTree.java
index 9d5af70..79e95cb 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/dircache/DirCacheTree.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/dircache/DirCacheTree.java
@@ -377,7 +377,8 @@ private int computeSize(final DirCacheEntry[] cache, int cIdx,
final FileMode mode = e.getFileMode();
if (mode.getObjectType() == Constants.OBJ_BAD)
- throw new UnmergedPathException(e);
+ throw new IllegalStateException("Entry \"" + e.getPathString()
+ + "\" has incorrect mode set up.");
size += mode.copyToLength();
size += ep.length - pathOffset;
--
1.6.3.3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html