From: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed, 25 Aug 2010 21:16:41 GMT
Subject: Re: [PATCH 2/2] builtin/fetch.c: ignore merge config when not fetching from branch's remote
Message-ID: <20100825211641.GC2319@burratino>
In-Reply-To: <O7UxM6KEqdDAhjJAF7ODSlo_kZavb8gBCJ6laH3QPOlG9a1q29koMQOkS7wDMj0BpyrLYfAcEh4@cipher.nrlssc.navy.mil>

Brandon Casey wrote:

> If the argument to fetch does not specify a named remote, or if the name
> supplied does not match the remote configured for the current branch, then
> the current branch's merge configuration should not be considered.

Thanks for a fix.

> +++ b/builtin/fetch.c
> @@ -146,7 +146,8 @@ static struct ref *get_ref_map(struct transport *transport,
>  		struct remote *remote = transport->remote;
>  		struct branch *branch = branch_get(NULL);
>  		int has_merge = branch_has_merge_config(branch);
> -		if (remote && (remote->fetch_refspec_nr || has_merge)) {
> +		if (remote && (remote->fetch_refspec_nr || (has_merge &&
> +				!strcmp(branch->remote_name, remote->name)))) {

What will happen with this (invalid) branch?

	[branch "tmp"]
		merge = refs/heads/tmp