From: Junio C Hamano <gitster@pobox.com>
To: Michael J Gruber <git@drmicha.warpmail.net>
Cc: Git Mailing List <git@vger.kernel.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Daniel Barkalow <barkalow@iabervon.org>
Subject: Re: Tracking of local branches
Date: Fri, 20 Mar 2009 09:46:02 -0700 [thread overview]
Message-ID: <7viqm4i1md.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <49C3A6AE.7020104@drmicha.warpmail.net> (Michael J. Gruber's message of "Fri, 20 Mar 2009 15:22:38 +0100")
Michael J Gruber <git@drmicha.warpmail.net> writes:
> I semi-successfully messed around in remote.c (format_tracking_info(),
> stat_tracking_info()) to make it use branch->merge_name rather than
> branch->merge. This makes "git status" work as expected ("Your branch
> is... severely screwed.") for tracked local branches. (It's messed up
> for remote ones but hey it was a first shot; merge[0]->dst is really
> needed here I guess.)
>
> Now I could go after sha1_name.c and do the same,
>
> OR
>
> make it so that all branches have their merge member set up, uhm. Any
> possible side effects?
My gut feeling is that the latter if works should be preferable for
consistency if nothing else.
The "struct branch" hasn't changed ever since it was introduced by cf81834
(Report information on branches from remote.h, 2007-09-10) and Daniel
might know about some corner cases that rely on branch.merge not being set
up for local ones, but honestly, I would think it would be a bug in the
existing code if there were such cases.
next prev parent reply other threads:[~2009-03-20 16:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-20 14:22 Tracking of local branches Michael J Gruber
2009-03-20 16:13 ` Michael J Gruber
2009-03-20 16:46 ` Junio C Hamano [this message]
2009-03-20 18:10 ` Daniel Barkalow
2009-03-26 20:53 ` [PATCH 0/2] Make local branches behave like remote branches when --tracked Michael J Gruber
2009-03-26 20:53 ` [PATCH 1/2] Test for local branches being followed with --track Michael J Gruber
2009-03-26 20:53 ` [PATCH 2/2] Make local branches behave like remote branches when --tracked Michael J Gruber
2009-03-27 8:08 ` Junio C Hamano
2009-03-27 8:47 ` Michael J Gruber
2009-03-27 16:20 ` Junio C Hamano
2009-03-27 16:52 ` Michael J Gruber
2009-04-01 21:42 ` [PATCHv2 0/2] " Michael J Gruber
2009-04-01 21:42 ` [PATCHv2 1/2] Test for local branches being followed with --track Michael J Gruber
2009-04-01 21:42 ` [PATCHv2 2/2] Make local branches behave like remote branches when --tracked Michael J Gruber
2009-03-26 20:57 ` [PATCH 0/2] " Michael J Gruber
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=7viqm4i1md.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).