From: Tanay Abhra Date: Thu, 7 Aug 2014 16:21:19 +0000 (-0700) Subject: archive.c: replace `git_config()` with `git_config_get_bool()` family X-Git-Tag: v2.2.0-rc0~147^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95790ff60d35e6a9e212fa0f9ffedaabddd1182c;p=thirdparty%2Fgit.git archive.c: replace `git_config()` with `git_config_get_bool()` family Use `git_config_get_bool()` family instead of `git_config()` to take advantage of the config-set API which provides a cleaner control flow. Signed-off-by: Tanay Abhra Reviewed-by: Matthieu Moy Signed-off-by: Junio C Hamano --- diff --git a/archive.c b/archive.c index 3fc0fb2928..952a659bcb 100644 --- a/archive.c +++ b/archive.c @@ -402,14 +402,6 @@ static int parse_archive_args(int argc, const char **argv, return argc; } -static int git_default_archive_config(const char *var, const char *value, - void *cb) -{ - if (!strcmp(var, "uploadarchive.allowunreachable")) - remote_allow_unreachable = git_config_bool(var, value); - return git_default_config(var, value, cb); -} - int write_archive(int argc, const char **argv, const char *prefix, int setup_prefix, const char *name_hint, int remote) { @@ -420,7 +412,9 @@ int write_archive(int argc, const char **argv, const char *prefix, if (setup_prefix && prefix == NULL) prefix = setup_git_directory_gently(&nongit); - git_config(git_default_archive_config, NULL); + git_config_get_bool("uploadarchive.allowunreachable", &remote_allow_unreachable); + git_config(git_default_config, NULL); + init_tar_archiver(); init_zip_archiver();