Re: [RFC] checkout to notice forks (Re: Minor annoyance with git push)

From: Daniel Barkalow <barkalow@iabervon.org>
Date: Feb 17, 2008, 17:36 UTC
Message-ID: <alpine.LNX.1.00.0802171146220.5496@iabervon.org>
In-Reply-To: <7vy79k2fus.fsf@gitster.siamese.dyndns.org>

On Sat, 16 Feb 2008, Junio C Hamano wrote:

Show 8 quoted lines

> Daniel Barkalow <barkalow@iabervon.org> writes:
> 
> > I'm also in part worried about the lack of publicity "struct branch" has 
> > gotten; it would have saved you having to write 64 of 136 lines, so it's 
> > worth you knowing about.
> 
> Actually, I initially took a look at branch.h and tried to reuse
> find_tracked_branch() but then realized it was a wrong interface.

Yeah, that's the other direction, and for setting it up (so the configuration isn't there yet, and it's trying to figure out what the requested default is).

> The "struct branch" in remote.h (Heh) looks like the right
> interface.

Now that branch.h exists, it probably should have struct branch, I guess. Back when I made struct branch, it was just about finding the right configuration for fetch, so I was thinking more about the "doing the right thing with remotes" aspect than the "configuration about branches" aspect. They're somewhat intertwined, in any case, because remote_get(NULL) uses the branch configuration to find the default, and branch_get() uses the remote configuration to interpret merge settings.

> Documentation/technical/api-*.txt should really talk about
> what's in remote.c.

Ah, that's where that should go. I remember reading about it while I was on vacation and promptly forgetting all about it. Writing stuff up now.

	-Daniel
*This .sig left intentionally blank*