aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/storage
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2021-12-30 23:56:32 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2021-12-30 23:56:32 +0100
commit725e77a5176384ff55195a302888cd661440a031 (patch)
tree7513751780b2345e423720883431390fae501014 /org.eclipse.jgit/src/org/eclipse/jgit/storage
parent9fd632b0e444a0efa8535c6c5347284931b6c926 (diff)
parent1343dd2de7c240840f99820115f36b83978c86b5 (diff)
downloadjgit-725e77a5176384ff55195a302888cd661440a031.tar.gz
jgit-725e77a5176384ff55195a302888cd661440a031.zip
Merge branch 'stable-5.7' into stable-5.8stable-5.8
* stable-5.7: Use FileSnapshot without using configs for FileBasedConfig Change-Id: If9cc2f2bae5dbead7a38218828da461540be942e
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/storage')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileBasedConfig.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileBasedConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileBasedConfig.java
index 0b9b981088..7b5f00e4fe 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileBasedConfig.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileBasedConfig.java
@@ -219,7 +219,7 @@ public class FileBasedConfig extends StoredConfig {
if (!lf.lock())
throw new LockFailedException(getFile());
try {
- lf.setNeedSnapshot(true);
+ lf.setNeedSnapshotNoConfig(true);
lf.write(out);
if (!lf.commit())
throw new IOException(MessageFormat.format(JGitText.get().cannotCommitWriteTo, getFile()));