Re: [PATCH 2/3] upload-pack: prepare to extend allow-tip-sha1-in-want

Fredrik Medley [off-list ref] writes:

 static int upload_pack_config(const char *var, const char *value, void *unused)
 {
-	if (!strcmp("uploadpack.allowtipsha1inwant", var))
-		allow_tip_sha1_in_want = git_config_bool(var, value);
-	else if (!strcmp("uploadpack.keepalive", var)) {
+	if (!strcmp("uploadpack.allowtipsha1inwant", var)) {
+		if (git_config_bool(var, value))
+			allow_unadvertised_object_request |= ALLOW_TIP_SHA1;

Doesn't this change break the behaviour?

Shouldn't you be able to say

	[uploadpack]
        	allowTipSHA1InWant = false

in a higher-precedence configuration file to override the same
variable in other files in the configuration chain that may set it
to true?

+	} else if (!strcmp("uploadpack.keepalive", var)) {
 		keepalive = git_config_int(var, value);
 		if (!keepalive)
 			keepalive = -1;

2015-05-20 0:00 GMT+02:00 Junio C Hamano [off-list ref]:

Fredrik Medley [off-list ref] writes:

quoted

 static int upload_pack_config(const char *var, const char *value, void *unused)
 {
-     if (!strcmp("uploadpack.allowtipsha1inwant", var))
-             allow_tip_sha1_in_want = git_config_bool(var, value);
-     else if (!strcmp("uploadpack.keepalive", var)) {
+     if (!strcmp("uploadpack.allowtipsha1inwant", var)) {
+             if (git_config_bool(var, value))
+                     allow_unadvertised_object_request |= ALLOW_TIP_SHA1;

Doesn't this change break the behaviour?

Shouldn't you be able to say

        [uploadpack]
                allowTipSHA1InWant = false

in a higher-precedence configuration file to override the same
variable in other files in the configuration chain that may set it
to true?

Of course, thought it work differently. Should I add tests with
test_config_global
to check that loading the config works as well?

quoted

+     } else if (!strcmp("uploadpack.keepalive", var)) {
              keepalive = git_config_int(var, value);
              if (!keepalive)
                      keepalive = -1;