git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCHv4 2/4] parse-remote: support default reflist in get_remote_merge_branch

From
SBSanti Béjar <santi@agolina.net>
Date
Jun 12, 2009, 06:58 UTC
Message-ID
<adf1fd3d0906112358oad66387u46765919b63af816@mail.gmail.com>
In-Reply-To
<7vocsucfn7.fsf@alter.siamese.dyndns.org>
2009/6/12 Junio C Hamano <gitster@pobox.com>:
Show 8 quoted lines
> 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.
Show 7 quoted lines
>
> 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

Previous: Junio C HamanoNext: Santi Béjar
Message 5 of 9 in “[PATCHv4 0/4] git pull --rebase fixes and cleanup”
  1. Santi BéjarJun 11, 2009
  2. 1/4 parse-remote: function to get the tracking branch to be mergeSanti Béjar, Jun 11, 2009
  3. 2/4 parse-remote: support default reflist in get_remote_merge_branchSanti Béjar, Jun 11, 2009
  4. Junio C HamanoJun 12, 2009
  5. Santi BéjarJun 12, 2009
  6. 3/4 t5520-pull: --rebase with rebased upstream and two branchesSanti Béjar, Jun 11, 2009
  7. Junio C HamanoJun 11, 2009
  8. Junio C HamanoJun 12, 2009
  9. 4/4 parse-remote: remove unused functionsSanti Béjar, Jun 11, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.