]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ns/core-fsyncmethod'
authorJunio C Hamano <gitster@pobox.com>
Mon, 4 Apr 2022 17:56:22 +0000 (10:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Apr 2022 17:56:22 +0000 (10:56 -0700)
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

1  2 
cache.h
config.c

diff --cc cache.h
index ef7d34b7a095212839898e83b3475bdd69a16f09,e0b741597223049a24076e4d75aaa77fb8e8eee5..ee9549c46016bb8dff5af87e6cdbecee60571c79
+++ 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)
diff --cc config.c
Simple merge