diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-04-04 10:56:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-04-04 10:56:22 -0700 |
| commit | 27dd46079980a8f80c5e70bc8fa5ee4c9b54995e (patch) | |
| tree | de86dda86188f9857ed7ece010db74a678767698 /cache.h | |
| parent | Merge branch 'dp/worktree-repair-in-usage' (diff) | |
| parent | core.fsyncmethod: correctly camel-case warning message (diff) | |
| download | git-27dd46079980a8f80c5e70bc8fa5ee4c9b54995e.tar.gz git-27dd46079980a8f80c5e70bc8fa5ee4c9b54995e.zip | |
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
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1014,8 +1014,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 | \ |