diff options
-rw-r--r-- | cache.h | 4 | ||||
-rw-r--r-- | config.c | 2 |
2 files changed, 3 insertions, 3 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 | \ @@ -1695,7 +1695,7 @@ static int git_default_core_config(const char *var, const char *value, void *cb) if (!strcmp(var, "core.fsyncobjectfiles")) { if (fsync_object_files < 0) - warning(_("core.fsyncobjectfiles is deprecated; use core.fsync instead")); + warning(_("core.fsyncObjectFiles is deprecated; use core.fsync instead")); fsync_object_files = git_config_bool(var, value); return 0; } |