]> git.ipfire.org Git - thirdparty/git.git/commitdiff
core.fsync: fix incorrect expression for default configuration
authorNeeraj Singh <neerajsi@microsoft.com>
Tue, 29 Mar 2022 21:41:52 +0000 (21:41 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Mar 2022 23:04:16 +0000 (16:04 -0700)
Commit b9f5d035 (core.fsync: documentation and user-friendly
aggregate options, 2022-03-15) introduced an incorrect value for
FSYNC_COMPONENTS_DEFAULT. We need an AND-NOT rather than OR-NOT.

Signed-off-by: Neeraj Singh <neerajsi@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
cache.h

diff --git a/cache.h b/cache.h
index 86680f144ecf1a455ce2f6a851264d9dc83f9dbb..e0b741597223049a24076e4d75aaa77fb8e8eee5 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1013,8 +1013,8 @@ enum fsync_component {
 #define FSYNC_COMPONENTS_DERIVED_METADATA (FSYNC_COMPONENT_PACK_METADATA | \
                                           FSYNC_COMPONENT_COMMIT_GRAPH)
 
-#define FSYNC_COMPONENTS_DEFAULT (FSYNC_COMPONENTS_OBJECTS | \
-                                 FSYNC_COMPONENTS_DERIVED_METADATA | \
+#define FSYNC_COMPONENTS_DEFAULT ((FSYNC_COMPONENTS_OBJECTS | \
+                                  FSYNC_COMPONENTS_DERIVED_METADATA) & \
                                  ~FSYNC_COMPONENT_LOOSE_OBJECT)
 
 #define FSYNC_COMPONENTS_COMMITTED (FSYNC_COMPONENTS_OBJECTS)