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: [PATCHv3 1/4] parse-remote: function to get the tracking branch  to be merge
Date: Tue, 9 Jun 2009 10:07:22 +0200	[thread overview]
Message-ID: <adf1fd3d0906090107w994de3chb39071e5911a59ae@mail.gmail.com> (raw)
In-Reply-To: <adf1fd3d0906090029s2aa7fe19j7b1005997d70b92c@mail.gmail.com>

2009/6/9 Santi Béjar <santi@agolina.net>:
> 2009/6/9 Junio C Hamano <gitster@pobox.com>:
>> Santi Béjar <santi@agolina.net> writes:
>>
>>> The only user of get_remote_refs_for_fetch was "git pull --rebase" and
>>> it only wanted the tracking branch to be merge. So, add a simple
>>> function with this new meaning.
>>>
>>> No behavior changes.
>>
>> I am all for code reduction, but after following the original logic that
>> uses remote_refs_for_fetch (which knows about things like "git pull there
>> +refs/heads/master:refs/heads/origin tag v1.6.0" from the command line)
>> that in turn calls canon_refs_list_for_fetch (which returns a list e.g.
>> +refs/heads/master:refs/heads/origin refs/tags/v1.6.0:refs/tags/v1.6.0),
>> and do not quite see how you can casually say "No behaviour changes."
>
> Ups, you are right. But even in you case the only important branch is
> the first, so the only possible change in behavior is:
>
> git pull --rebase tags v1.6.0

In fact: git pull --rebase remote tags v1.6.0

But this still works because oldremoteref defaults to defaults_merge.
So the only behavior change is when a remote branch is
rebased/retagged, and you have worst problems then. I think noone used
the rebased functionality in this way, so I don't think it is worth to
support it. But if someone think it is important I'll do it.

Santi

  reply	other threads:[~2009-06-09  8:07 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-08  9:00 [PATCHv3 1/4] parse-remote: function to get the tracking branch to be merge Santi Béjar
2009-06-08 23:30 ` Junio C Hamano
2009-06-09  7:29   ` Santi Béjar
2009-06-09  8:07     ` Santi Béjar [this message]
2009-06-09  8:28       ` Junio C Hamano
2009-06-09  8:50         ` Santi Béjar
2009-06-09 12:16           ` Santi Béjar
2009-06-11 21:30             ` 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=adf1fd3d0906090107w994de3chb39071e5911a59ae@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).