* stable-5.4: Prepare 5.4.2-SNAPSHOT builds JGit v5.4.1.201908211225-r Prepare 5.3.4-SNAPSHOT builds JGit v5.3.3.201908210735-r Add missing @since tag on FileTreeIterator#getLastModifiedInstant Prepare 5.1.10-SNAPSHOT builds JGit v5.1.9.201908210455-r Avoid sign extension when comparing mtime with Instant#getEpochSecond Fix deprecation in DirCache caused by Instant based DirCacheEntry Change-Id: I63156d6b73044d5d8820869a397a0aa94e607b50 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>tags/v5.5.0.201908280940-m3
@@ -657,8 +657,7 @@ public class DirCache { | |||
// Write the individual file entries. | |||
final int smudge_s; | |||
final int smudge_ns; | |||
Instant smudge; | |||
if (myLock != null) { | |||
// For new files we need to smudge the index entry | |||
// if they have been modified "now". Ideally we'd | |||
@@ -666,12 +665,10 @@ public class DirCache { | |||
// so we use the current timestamp as a approximation. | |||
myLock.createCommitSnapshot(); | |||
snapshot = myLock.getCommitSnapshot(); | |||
smudge_s = (int) (snapshot.lastModifiedInstant().getEpochSecond()); | |||
smudge_ns = snapshot.lastModifiedInstant().getNano(); | |||
smudge = snapshot.lastModifiedInstant(); | |||
} else { | |||
// Used in unit tests only | |||
smudge_ns = 0; | |||
smudge_s = 0; | |||
smudge = Instant.EPOCH; | |||
} | |||
// Check if tree is non-null here since calling updateSmudgedEntries | |||
@@ -683,8 +680,9 @@ public class DirCache { | |||
for (int i = 0; i < entryCnt; i++) { | |||
final DirCacheEntry e = sortedEntries[i]; | |||
if (e.mightBeRacilyClean(smudge_s, smudge_ns)) | |||
if (e.mightBeRacilyClean(smudge)) { | |||
e.smudgeRacilyClean(); | |||
} | |||
e.write(dos); | |||
} | |||
@@ -378,7 +378,7 @@ public class DirCacheEntry { | |||
// | |||
final int base = infoOffset + P_MTIME; | |||
final int mtime = NB.decodeInt32(info, base); | |||
if (smudge.getEpochSecond() == mtime) { | |||
if ((int) smudge.getEpochSecond() == mtime) { | |||
return smudge.getNano() <= NB.decodeInt32(info, base + 4); | |||
} | |||
return false; |
@@ -412,6 +412,9 @@ public class FileTreeIterator extends WorkingTreeIterator { | |||
return attributes.getLastModifiedInstant().toEpochMilli(); | |||
} | |||
/** | |||
* @since 5.1.9 | |||
*/ | |||
@Override | |||
public Instant getLastModifiedInstant() { | |||
return attributes.getLastModifiedInstant(); |