Merge branch 'stable-5.1' into stable-5.2

* stable-5.1:
  Fix WorkingTreeIterator.compareMetadata() for CheckStat.MINIMAL

Change-Id: Ic4ee37fb36f61dc7707391f768bf78a33094bfd3
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

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

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