* stable-5.2: Fix WorkingTreeIterator.compareMetadata() for CheckStat.MINIMAL Change-Id: I57093dfef181645088767471159c204c50961c3a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>tags/v5.5.0.201909110433-r
@@ -951,9 +951,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; |