Re: confusion over the new branch and merge config

From: Andy Parkins <andyparkins@gmail.com>
Date: Dec 22, 2006, 08:39 UTC
Message-ID: <200612220839.36067.andyparkins@gmail.com>
In-Reply-To: <7vfyb85ojf.fsf@assigned-by-dhcp.cox.net>

On Friday 2006 December 22 08:21, Junio C Hamano wrote:

> Heh, sounds like you spotted a bug -- patches welcome (or I'll
> fix it myself if I get around to it before everybody else).
> Thanks.

I can't reproduce this bug. I tried having an identically named branch in both remotes and heads. Output was fine. I don't like to say "impossible", but it certainly seems that

This from append_ref():
    } else if (!strncmp(refname, "refs/remotes/", 13)) {
        kind = REF_REMOTE_BRANCH;

and this from print_ref_list():
    if (ref_list.list[i].kind == REF_LOCAL_BRANCH &&
        !strcmp(ref_list.list[i].name, head)) {
            c = '*';

Make it almost inconceivable that a remote branch is being starred, or that a local branch is making it into the "-r" output.

Alan: could you show a tree of your .git/refs/heads and your .git/refs/remotes 
for the repository that is displaying this error?

Andy

-- 
Dr Andy Parkins, M Eng (hons), MIEE
andyparkins@gmail.com