diff options
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -1342,7 +1342,7 @@ static const struct fsync_component_name { static enum fsync_component parse_fsync_components(const char *var, const char *string) { - enum fsync_component current = FSYNC_COMPONENTS_DEFAULT; + enum fsync_component current = FSYNC_COMPONENTS_PLATFORM_DEFAULT; enum fsync_component positive = 0, negative = 0; while (string) { @@ -1688,6 +1688,8 @@ static int git_default_core_config(const char *var, const char *value, void *cb) fsync_method = FSYNC_METHOD_FSYNC; else if (!strcmp(value, "writeout-only")) fsync_method = FSYNC_METHOD_WRITEOUT_ONLY; + else if (!strcmp(value, "batch")) + fsync_method = FSYNC_METHOD_BATCH; else warning(_("ignoring unknown core.fsyncMethod value '%s'"), value); @@ -1781,6 +1783,9 @@ static int git_default_branch_config(const char *var, const char *value) } else if (value && !strcmp(value, "inherit")) { git_branch_track = BRANCH_TRACK_INHERIT; return 0; + } else if (value && !strcmp(value, "simple")) { + git_branch_track = BRANCH_TRACK_SIMPLE; + return 0; } git_branch_track = git_config_bool(var, value); return 0; @@ -3190,7 +3195,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, goto out_free; } /* if nothing to unset, error out */ - if (value == NULL) { + if (!value) { ret = CONFIG_NOTHING_SET; goto out_free; } @@ -3206,7 +3211,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, int i, new_line = 0; struct config_options opts; - if (value_pattern == NULL) + if (!value_pattern) store.value_pattern = NULL; else if (value_pattern == CONFIG_REGEX_NONE) store.value_pattern = CONFIG_REGEX_NONE; @@ -3346,7 +3351,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, } /* write the pair (value == NULL means unset) */ - if (value != NULL) { + if (value) { if (!store.section_seen) { if (write_section(fd, key, &store) < 0) goto write_err_out; @@ -3567,7 +3572,7 @@ static int git_config_copy_or_rename_section_in_file(const char *config_filename offset = section_name_match(&buf[i], old_name); if (offset > 0) { ret++; - if (new_name == NULL) { + if (!new_name) { remove = 1; continue; } |