diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-10 22:03:06 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-10 22:03:06 +0200 |
| commit | 524fd0d8c663278a4595016fa97d89718caf6e6c (patch) | |
| tree | 32c67aa6bab4258a53803bd6b7c022f7632d1bf8 | |
| parent | b31d5360f0d1eaa9f6547079fe97988218fe5fe5 (diff) | |
| parent | 3c0230d84437cf310ff69847a5a39c5eb18564a6 (diff) | |
| download | jgit-524fd0d8c663278a4595016fa97d89718caf6e6c.tar.gz jgit-524fd0d8c663278a4595016fa97d89718caf6e6c.zip | |
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>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java index f816ff370e..7424c13e2c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java @@ -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; |