git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Santi Béjar" <santi@agolina.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCHv4 2/4] parse-remote: support default reflist in  get_remote_merge_branch
Date: Fri, 12 Jun 2009 08:58:07 +0200	[thread overview]
Message-ID: <adf1fd3d0906112358oad66387u46765919b63af816@mail.gmail.com> (raw)
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

  reply	other threads:[~2009-06-12  6:58 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-11 22:39 [PATCHv4 0/4] git pull --rebase fixes and cleanup Santi Béjar
2009-06-11 22:39 ` [PATCHv4 1/4] parse-remote: function to get the tracking branch to be merge Santi Béjar
2009-06-11 22:39 ` [PATCHv4 2/4] parse-remote: support default reflist in get_remote_merge_branch Santi Béjar
2009-06-12  3:09   ` Junio C Hamano
2009-06-12  6:58     ` Santi Béjar [this message]
2009-06-11 22:39 ` [PATCHv4 3/4] t5520-pull: --rebase with rebased upstream and two branches Santi Béjar
2009-06-11 23:19   ` Junio C Hamano
2009-06-12  2:57   ` Junio C Hamano
2009-06-11 22:39 ` [PATCHv4 4/4] parse-remote: remove unused functions Santi Béjar

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=adf1fd3d0906112358oad66387u46765919b63af816@mail.gmail.com \
    --to=santi@agolina.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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).