Re: [PATCH] git-remote rename should match whole string when renaming remote ref directory

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 26, 2011, 18:04 UTC
Message-ID: <7v62kf41ud.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1317045186-25206-1-git-send-email-benny@tonian.com>

Benny Halevy <benny@tonian.com> writes:

Show 18 quoted lines

> From: Benny Halevy <bhalevy@tonian.com>
>
> Otherwise, with two remotes: test, test-2
> 	git remote rename test test-
> ends up with:
> 	.git/refs/remotes/test-
> 	.git/refs/remotes/test--2
> ...
> diff --git a/builtin/remote.c b/builtin/remote.c
> index f2a9c26..5443e71 100644
> --- a/builtin/remote.c
> +++ b/builtin/remote.c
> @@ -571,7 +571,7 @@ static int read_remote_branches(const char *refname,
>  	const char *symref;
>  
>  	strbuf_addf(&buf, "refs/remotes/%s", rename->old);
> -	if (!prefixcmp(refname, buf.buf)) {
> +	if (!strcmp(refname, buf.buf)) {

At this point of the code, refname has "refs/remotes/test/foo" and it is queued to later rename it to "refs/remotes/test-/foo" (the next invocation of this function will see "refs/remotes/test/bar" in refname). And the strbuf buf.buf has "refs/remotes/test"; your !strcmp(refname, buf.buf) would never trigger, I suspect.

Isn't 60e5eee (remote: "rename o foo" should not rename ref "origin/bar", 2011-09-01) the correct fix for this issue? It makes buf.buf properly terminated with a slash, to contain "refs/remotes/test/" so that prefixcmp properly matches it with "refs/remotes/test/foo" but not with refs under other hierarchies like "refs/remotes/test-2/anything".

Thanks.