diff options
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java index 52fc3db791..2ffc54872b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java @@ -197,8 +197,9 @@ public class IndexDiff { if (treeIterator != null) { if (dirCacheIterator != null) { - if (!treeIterator.getEntryObjectId().equals( - dirCacheIterator.getEntryObjectId())) { + if (!treeIterator.idEqual(dirCacheIterator) + || treeIterator.getEntryRawMode() + != dirCacheIterator.getEntryRawMode()) { // in repo, in index, content diff => changed changed.add(treeWalk.getPathString()); changesExist = true; |