Merge branch 'stable-5.4' into stable-5.5
* stable-5.4: Fix WorkingTreeIterator.compareMetadata() for CheckStat.MINIMAL Change-Id: Ibdda7687da015b17cdca67427202766fe102fee1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
commit
524fd0d8c6
|
@ -947,9 +947,10 @@ public MetadataDiff compareMetadata(DirCacheEntry entry) {
|
|||
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;
|
||||
|
|
Loading…
Reference in New Issue