From: Matthias Sohn <matthias.sohn@sap.com>
Date: Thu, 30 Dec 2021 22:51:41 +0000 (+0100)
Subject: Merge branch 'stable-5.5' into stable-5.6
X-Git-Tag: v6.1.0.202202221755-m3~76^2^2^2^2^2^2^2^2^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fheads%2Fstable-5.6;p=jgit.git

Merge branch 'stable-5.5' into stable-5.6

* stable-5.5:
  Use FileSnapshot without using configs for FileBasedConfig

Change-Id: If904289feecd1e0d8466c1fb998f160f14d54b61
---

a461472bd5ce5020f5c88522648156b3bb592926
diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java
index 78262e9773,eda4da8e90..d06b5a72d1
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java
@@@ -100,12 -133,10 +100,14 @@@ public class LockFile 
  
  	private boolean needSnapshot;
  
 -	private boolean snapshotNoConfig;
 +	private boolean fsync;
 +
 +	private boolean isAppend;
  
 -	boolean fsync;
 +	private boolean written;
 +
++	private boolean snapshotNoConfig;
+ 
  	private FileSnapshot commitSnapshot;
  
  	private LockToken token;