summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
diff options
context:
space:
mode:
authorVishal Devgire <vishaldevgire@gmail.com>2019-04-09 13:01:36 +0530
committerMatthias Sohn <matthias.sohn@sap.com>2019-08-12 14:35:06 +0200
commit9b4a55c0b65074e6abec4b9aff1b602ee6a976b9 (patch)
tree669ef6818029d8b69e4d43f26bd31064672e9380 /org.eclipse.jgit
parent4d46a68abee7a59bba7c5d85b5ad90206bc1d757 (diff)
downloadjgit-9b4a55c0b65074e6abec4b9aff1b602ee6a976b9.tar.gz
jgit-9b4a55c0b65074e6abec4b9aff1b602ee6a976b9.zip
Make supportsAtomicCreateNewFile return true as default
The method org.eclipse.jgit.util.FS.supportsAtomicCreateNewFile() should default to true as mentioned in docs [1] org.eclipse.jgit.util.FS_POSIX.supportsAtomicCreateNewFile() method will set the value to false if the git config core.supportsatomiccreatenewfile is not set. It should default to true if the configuration is undefined. [1] https://github.com/eclipse/jgit/blob/4169a95a65683e39e7a6a8f2b11b543e2bc754db/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java#L372 Bug: 544164 Change-Id: I16ccf989a89da2cf4975c200b3228b25ba4c0d55 Signed-off-by: Vishal Devgire <vishaldevgire@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java
index 8561f6f3a2..1c42f78577 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java
@@ -122,6 +122,10 @@ public class FS_POSIX extends FS {
ret = getAtomicFileCreationSupportOption(
SystemReader.getInstance().openSystemConfig(null, this));
}
+
+ if (ret == AtomicFileCreation.UNDEFINED) {
+ ret = AtomicFileCreation.SUPPORTED;
+ }
supportsAtomicCreateNewFile = ret;
}
@@ -139,7 +143,8 @@ public class FS_POSIX extends FS {
? AtomicFileCreation.SUPPORTED
: AtomicFileCreation.NOT_SUPPORTED;
} catch (IOException | ConfigInvalidException e) {
- return AtomicFileCreation.SUPPORTED;
+ LOG.error(e.getMessage(), e);
+ return AtomicFileCreation.UNDEFINED;
}
}