From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Nov 2018 13:58:08 +0000 (+0900)
Subject: Merge branch 'jk/uploadpack-packobjectshook-fix' into maint
X-Git-Tag: v2.19.2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b153408b459e2483fca0215b44b0a1199a1b352;p=thirdparty%2Fgit.git

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

Code clean-up that results in a small bugfix.

* jk/uploadpack-packobjectshook-fix:
  upload-pack: fix broken if/else chain in config callback
---

2b153408b459e2483fca0215b44b0a1199a1b352
diff --cc upload-pack.c
index 2ae9d9bb47,a47e4c2692..9d4d6ad82f
--- a/upload-pack.c
+++ b/upload-pack.c
@@@ -1076,14 -1070,15 +1076,17 @@@ static int upload_pack_config(const cha
  		keepalive = git_config_int(var, value);
  		if (!keepalive)
  			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)) {
  		allow_filter = git_config_bool(var, value);
 +	} else if (!strcmp("uploadpack.allowrefinwant", var)) {
 +		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");
  }