diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/RenameDetector.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/RenameDetector.java
index 04e669ffe..5bb63c4dd 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/RenameDetector.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/RenameDetector.java
@@ -351,8 +351,10 @@ private void findExactRenames(ProgressMonitor pm) {
 				List<DiffEntry> list = (List<DiffEntry>) del;
 				DiffEntry best = null;
 				for (DiffEntry e : list) {
-					if (best == null && sameType(e.oldMode, dst.newMode))
+					if (sameType(e.oldMode, dst.newMode)) {
 						best = e;
+						break;
+					}
 				}
 				if (best != null) {
 					if (best.changeType == ChangeType.DELETE) {