undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/uploadpack-packobjectshook-fix' into maint

Browse Source 
Code clean-up that results in a small bugfix.

* jk/uploadpack-packobjectshook-fix:
  upload-pack: fix broken if/else chain in config callback
This commit is contained in:
Junio C Hamano 2018-11-21 22:58:08 +09:00
commit 2b153408b4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
upload-pack.c
View File

@ -1076,14 +1076,17 @@ static int upload_pack_config(const char *var, const char *value, void *unused)
keepalive = git_config_int(var, value); keepalive = git_config_int(var, value);
if (!keepalive) if (!keepalive)
keepalive = -1; keepalive = -1;
} else if (current_config_scope() != CONFIG_SCOPE_REPO) {
if (!strcmp("uploadpack.packobjectshook", var))
return git_config_string(&pack_objects_hook, var, value);
} else if (!strcmp("uploadpack.allowfilter", var)) { } else if (!strcmp("uploadpack.allowfilter", var)) {
allow_filter = git_config_bool(var, value); allow_filter = git_config_bool(var, value);
} else if (!strcmp("uploadpack.allowrefinwant", var)) { } else if (!strcmp("uploadpack.allowrefinwant", var)) {
allow_ref_in_want = git_config_bool(var, value); allow_ref_in_want = git_config_bool(var, value);
} }
if (current_config_scope() != CONFIG_SCOPE_REPO) {
if (!strcmp("uploadpack.packobjectshook", var))
return git_config_string(&pack_objects_hook, var, value);
}
return parse_hide_refs_config(var, value, "uploadpack"); return parse_hide_refs_config(var, value, "uploadpack");
} }