motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Merge branch 'stable-5.5'"

This commit is contained in:
David Pursehouse 2019-09-11 20:53:11 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent c78fbf23a5 5c29fdd23c
commit 0bfba11186
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
View File

@ -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;