From: Andy Parkins <andyparkins@gmail•com>
To: git@vger•kernel.org
Cc: Junio C Hamano <junkio@cox•net>,
Alan Chandler <alan@chandlerfamily•org.uk>
Subject: Re: confusion over the new branch and merge config
Date: Fri, 22 Dec 2006 08:39:33 +0000 [thread overview]
Message-ID: <200612220839.36067.andyparkins@gmail.com> (raw)
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
next prev parent reply other threads:[~2006-12-22 8:39 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-21 22:17 confusion over the new branch and merge config Nicolas Pitre
2006-12-21 23:01 ` Junio C Hamano
2006-12-21 23:21 ` Sean
2006-12-22 0:39 ` Junio C Hamano
2006-12-22 0:46 ` Junio C Hamano
2006-12-22 1:01 ` Sean
2006-12-22 8:31 ` Andy Parkins
2006-12-22 7:50 ` Alan Chandler
2006-12-22 8:21 ` Junio C Hamano
2006-12-22 8:39 ` Andy Parkins [this message]
2006-12-22 15:25 ` Alan Chandler
2006-12-22 20:49 ` Nicolas Pitre
2006-12-22 21:04 ` Jakub Narebski
2006-12-22 21:20 ` Nicolas Pitre
2006-12-22 22:40 ` Jakub Narebski
2006-12-22 23:39 ` Junio C Hamano
2006-12-23 3:10 ` Tom Prince
2006-12-23 5:11 ` Nicolas Pitre
2006-12-23 5:12 ` Jeff King
2006-12-23 5:29 ` Nicolas Pitre
2006-12-23 6:15 ` Junio C Hamano
2006-12-23 6:22 ` Shawn Pearce
2006-12-23 6:28 ` Jeff King
2006-12-23 7:11 ` Junio C Hamano
2006-12-23 7:25 ` Jeff King
2006-12-23 9:51 ` Junio C Hamano
2006-12-23 10:40 ` Jakub Narebski
2006-12-23 15:58 ` Johannes Schindelin
2006-12-23 22:48 ` Jakub Narebski
2006-12-24 6:15 ` Jeff King
2006-12-24 20:49 ` Nicolas Pitre
2006-12-26 7:33 ` Jeff King
2007-01-02 14:49 ` Jeff King
2007-01-02 17:32 ` Junio C Hamano
2007-01-02 17:34 ` Jeff King
2007-01-02 20:04 ` Junio C Hamano
2007-01-02 20:30 ` Jakub Narebski
2007-01-03 0:24 ` Santi Béjar
2007-01-03 23:02 ` Jakub Narebski
2007-01-09 15:05 ` Jeff King
2007-01-09 16:18 ` Jeff King
2006-12-23 8:31 ` Jakub Narebski
2006-12-22 8:41 ` Andy Parkins
2006-12-22 9:39 ` Lars Hjemli
2006-12-22 15:10 ` Nicolas Pitre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200612220839.36067.andyparkins@gmail.com \
--to=andyparkins@gmail$(echo .)com \
--cc=alan@chandlerfamily$(echo .)org.uk \
--cc=git@vger$(echo .)kernel.org \
--cc=junkio@cox$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox