fetchpack.c: replace `git_config()` with `git_config_get_*()` family
Use `git_config_get_*()` family instead of `git_config()` to take advantage of the config-set API which provides a cleaner control flow. Signed-off-by: Tanay Abhra <tanayabh@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tanay Abhra committed
Aug 7, 2014 at 09:21 UTC
f44af51d1380d2bab18dad64e9c0bbe171c72486
1 file changed
+8
-27
fetch-pack.c
+8
-27
@@ -869,34 +869,15 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
869
return ref;
870
}
871
872
-static int fetch_pack_config(const char *var, const char *value, void *cb)
872
+static void fetch_pack_config(void)
873
{
874
- if (strcmp(var, "fetch.unpacklimit") == 0) {
875
- fetch_unpack_limit = git_config_int(var, value);
876
- return 0;
877
- }
878
-
879
- if (strcmp(var, "transfer.unpacklimit") == 0) {
880
- transfer_unpack_limit = git_config_int(var, value);
881
- return 0;
882
- }
883
-
884
- if (strcmp(var, "repack.usedeltabaseoffset") == 0) {
885
- prefer_ofs_delta = git_config_bool(var, value);
886
- return 0;
887
- }
888
-
889
- if (!strcmp(var, "fetch.fsckobjects")) {
890
- fetch_fsck_objects = git_config_bool(var, value);
891
- return 0;
892
- }
893
-
894
- if (!strcmp(var, "transfer.fsckobjects")) {
895
- transfer_fsck_objects = git_config_bool(var, value);
896
- return 0;
897
- }
874
+ git_config_get_int("fetch.unpacklimit", &fetch_unpack_limit);
875
+ git_config_get_int("transfer.unpacklimit", &transfer_unpack_limit);
876
+ git_config_get_bool("repack.usedeltabaseoffset", &prefer_ofs_delta);
877
+ git_config_get_bool("fetch.fsckobjects", &fetch_fsck_objects);
878
+ git_config_get_bool("transfer.fsckobjects", &transfer_fsck_objects);
879
899
- return git_default_config(var, value, cb);
880
+ git_config(git_default_config, NULL);
881
}
882
883
static void fetch_pack_setup(void)
@@ -904,7 +885,7 @@ static void fetch_pack_setup(void)
885
static int did_setup;
886
if (did_setup)
887
return;
907
- git_config(fetch_pack_config, NULL);
888
+ fetch_pack_config();
889
if (0 <= transfer_unpack_limit)
890
unpack_limit = transfer_unpack_limit;
891
else if (0 <= fetch_unpack_limit)