* stable-5.5: Prepare 5.5.1-SNAPSHOT builds JGit v5.5.0.201909110433-r Fix WorkingTreeIterator.compareMetadata() for CheckStat.MINIMAL Change-Id: I113ce255739786623f7e101dc293b9a769abeff0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>tags/v5.6.0.201911271000-m3
@@ -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; | |||
} | |||
} | |||
if (!fileLastModified.equals(cacheLastModified)) { | |||
} else if (!fileLastModified.equals(cacheLastModified)) { | |||
return MetadataDiff.DIFFER_BY_TIMESTAMP; | |||
} else if (entry.isSmudged()) { | |||
return MetadataDiff.SMUDGED; |