From: Thomas Wolf <thomas.wolf@paranor.ch>
Date: Sun, 26 Dec 2021 14:35:30 +0000 (+0100)
Subject: Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot creation"
X-Git-Tag: v6.1.0.202202221755-m3~77^2^2^2^2^2^2^2^2^2^2^2^2^2^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7828ef349cfb671cf9673d766a420c032d7ffb45;p=jgit.git

Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot creation"

This reverts commit f829f5f838e0f9c17373ea6cb3407976a8f395ff.

Using MISSING_FILEKEY as indicator for a non-existing file doesn't work
on Windows.

Bug: 577954
Change-Id: I92102a3d259f6cc0f367096a3213cfa794466817
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 654e98d817..487ae06014 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
@@ -439,15 +439,6 @@ public class FileSnapshot {
 		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 c34be9cc0a..0b8e0797ef 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
@@ -1103,10 +1103,6 @@ public class RefDirectory extends RefDatabase {
 		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) {