diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-10 21:27:06 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-10 22:00:40 +0200 |
| commit | 3c0230d84437cf310ff69847a5a39c5eb18564a6 (patch) | |
| tree | 6b18b002c622d403859e005183fac35ecfce918a /org.eclipse.jgit | |
| parent | 3cd6eec0da531dedf4847e509bec6ed294d5d7e5 (diff) | |
| parent | 8f96e1bebb20b7f2bbf9063f329a59a008090b02 (diff) | |
| download | jgit-3c0230d84437cf310ff69847a5a39c5eb18564a6.tar.gz jgit-3c0230d84437cf310ff69847a5a39c5eb18564a6.zip | |
Merge branch 'stable-5.3' into stable-5.4
* stable-5.3:
Fix WorkingTreeIterator.compareMetadata() for CheckStat.MINIMAL
Change-Id: Ie8447fc28b03bfc918cee0cc2162a2aa3585f3ea
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit')
| -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; |