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

From: Junio C Hamano <gitster@pobox.com>
Date: May 19, 2015, 22:00 UTC
Message-ID: <xmqqzj505isz.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1432068269-14895-2-git-send-email-fredrik.medley@gmail.com>

Fredrik Medley <fredrik.medley@gmail.com> writes:

Show 8 quoted lines

>  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;