From: Neeraj Singh Date: Tue, 29 Mar 2022 21:41:52 +0000 (+0000) Subject: core.fsync: fix incorrect expression for default configuration X-Git-Tag: v2.36.0-rc0~11^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5ec440c982417d39908b9a4bab79523a6a37f6c;p=thirdparty%2Fgit.git core.fsync: fix incorrect expression for default configuration 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 Signed-off-by: Junio C Hamano --- diff --git a/cache.h b/cache.h index 86680f144e..e0b7415972 100644 --- 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)