Merge "Merge branch 'stable-5.5'"

org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java

@@ -947,9 +947,10 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator {
 			if (fileLastModified.getEpochSecond() != cacheLastModified
 					.getEpochSecond()) {
 				return MetadataDiff.DIFFER_BY_TIMESTAMP;
+			} else if (entry.isSmudged()) {
+				return MetadataDiff.SMUDGED;
 			}
-		}
+		} else if (!fileLastModified.equals(cacheLastModified)) {
-		if (!fileLastModified.equals(cacheLastModified)) {
 			return MetadataDiff.DIFFER_BY_TIMESTAMP;
 		} else if (entry.isSmudged()) {
 			return MetadataDiff.SMUDGED;