From: Santi Béjar <santi@agolina.net>
Date: Fri, 12 Jun 2009 06:58:07 GMT
Subject: Re: [PATCHv4 2/4] parse-remote: support default reflist in get_remote_merge_branch
Message-ID: <adf1fd3d0906112358oad66387u46765919b63af816@mail.gmail.com>
In-Reply-To: <7vocsucfn7.fsf@alter.siamese.dyndns.org>

2009/6/12 Junio C Hamano <gitster@pobox.com>:
> Santi Béjar <santi@agolina.net> writes:
>
>> Expand get_remote_merge_branch to compute the tracking branch to merge
>> when called without arguments (or only the remote name).
>
> I've queued this series (sans 3/4--see other message), but I am wondering
> if this has the same "only works with the defeault layout" issue and if so
> if it should be documented more clearly.

As it uses:

git for-each-ref --format='%(upstream)' $curr_branch

it works with any layout, AFAICS.

>
> What plumbing support do you need to get the information in a more precise
> way in the scripted Porcelain?  Is exposing branch_get() from remote.c
> enough?  That is what is used by fill_tracking_info() in builtin-branch.c
> and the call to format_tracking_info() remote.c made by report_tracking()
> in builtin-checkout.c --- they are used to produce the "Your branch is
> ahead of that branch you are tracking" messages.

For the explicit case I would need something similar, given the remote
name and the remote branch return the tracking branch, as is currently
done in branch_get() but with the remote.$branch.remote and
remote.$branch.merge as input.

Thanks,
Santi