From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Apr 2022 17:56:22 +0000 (-0700)
Subject: Merge branch 'ns/core-fsyncmethod'
X-Git-Tag: v2.36.0-rc0~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27dd46079980a8f80c5e70bc8fa5ee4c9b54995e;p=thirdparty%2Fgit.git

Merge branch 'ns/core-fsyncmethod'

A couple of fix-up to a topic that is now in 'master'.

* ns/core-fsyncmethod:
  core.fsyncmethod: correctly camel-case warning message
  core.fsync: fix incorrect expression for default configuration
---

27dd46079980a8f80c5e70bc8fa5ee4c9b54995e
diff --cc cache.h
index ef7d34b7a0,e0b7415972..ee9549c460
--- a/cache.h
+++ b/cache.h
@@@ -1014,12 -1013,11 +1014,12 @@@ 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)
 +#define FSYNC_COMPONENTS_COMMITTED (FSYNC_COMPONENTS_OBJECTS | \
 +				    FSYNC_COMPONENT_REFERENCE)
  
  #define FSYNC_COMPONENTS_ADDED (FSYNC_COMPONENTS_COMMITTED | \
  				FSYNC_COMPONENT_INDEX)