Skip to content

Commit 32d5d73

Browse files
committed
Merge branch 'jk/uploadpack-packobjectshook-fix'
Code clean-up that results in a small bugfix. * jk/uploadpack-packobjectshook-fix: upload-pack: fix broken if/else chain in config callback
2 parents 5d8b3e5 + aaaa881 commit 32d5d73

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

upload-pack.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,14 +1029,17 @@ static int upload_pack_config(const char *var, const char *value, void *unused)
10291029
keepalive = git_config_int(var, value);
10301030
if (!keepalive)
10311031
keepalive = -1;
1032-
} else if (current_config_scope() != CONFIG_SCOPE_REPO) {
1033-
if (!strcmp("uploadpack.packobjectshook", var))
1034-
return git_config_string(&pack_objects_hook, var, value);
10351032
} else if (!strcmp("uploadpack.allowfilter", var)) {
10361033
allow_filter = git_config_bool(var, value);
10371034
} else if (!strcmp("uploadpack.allowrefinwant", var)) {
10381035
allow_ref_in_want = git_config_bool(var, value);
10391036
}
1037+
1038+
if (current_config_scope() != CONFIG_SCOPE_REPO) {
1039+
if (!strcmp("uploadpack.packobjectshook", var))
1040+
return git_config_string(&pack_objects_hook, var, value);
1041+
}
1042+
10401043
return parse_hide_refs_config(var, value, "uploadpack");
10411044
}
10421045

0 commit comments

Comments
 (0)