commit | fd612a12821910f7fbfca88e2f9b0b955e2845f0 | [log] [tgz] |
---|---|---|
author | Thomas Wolf <thomas.wolf@paranor.ch> | Sun Dec 26 15:53:38 2021 +0100 |
committer | Thomas Wolf <thomas.wolf@paranor.ch> | Sun Dec 26 15:54:12 2021 +0100 |
tree | edff7a391871003735fb774e6cf940c63754faa7 | |
parent | 8924b14d3afdb223d6e46e38e27a4cba25b26f23 [diff] | |
parent | 4cc21ccd3d1cd2374c4af3e164b8daef81be4505 [diff] |
Merge branch 'stable-5.4' into stable-5.5 * stable-5.4: Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot creation" Change-Id: Ia1665dd92ccc3811a6116f41421a05aca10fc6eb Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java index e4ee53e..93158f6 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java
@@ -440,15 +440,6 @@ return equals(other); } - /** - * Check if the file exists - * - * @return true if the file exists - */ - public boolean fileExists() { - return !MISSING_FILEKEY.equals(this.fileKey); - } - /** {@inheritDoc} */ @Override public int hashCode() {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index 6cb8a19..8cc9383 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java
@@ -1124,10 +1124,6 @@ final int limit = 4096; final byte[] buf; FileSnapshot otherSnapshot = FileSnapshot.save(path); - if (!otherSnapshot.fileExists()) { - return null; - } - try { buf = IO.readSome(path, limit); } catch (FileNotFoundException noFile) {