git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eugene Sajine <euguess@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, Thomas Rast <trast@student.ethz.ch>,
	git@vger.kernel.org
Subject: Re: origin/branchname and tracking branch pointing to different  commits?
Date: Tue, 29 Jun 2010 16:05:16 -0400	[thread overview]
Message-ID: <AANLkTik61QMnAn7rEoIOHlCMAuWgpdXWvmGVLCTn9YD1@mail.gmail.com> (raw)
In-Reply-To: <7vocet8ws2.fsf@alter.siamese.dyndns.org>

>> Jeff, Junio
>>
>> Could you, please, advise if there is any resolution on the patch?
>
> I do agree with Jeff that what his patch tried to do back in August last
> year was introducing backward compatibility and potentially breaking
> workflows of existing users by updating refs in an unexpected ways.
>
> However, as I discussed in
>
>    Subject: Re: origin/branchname and tracking branch pointing to different  commits?
>    Date: Thu, 07 Jan 2010 16:32:09 -0800
>    Message-ID: <7v7hrtzbau.fsf@alter.siamese.dyndns.org>
>
> I have a slight suspicion that such an "unexpected ref update" is not a
> big issue anymore.  So in principle, I think it is fine to change the
> behaviour of "git fetch $there $these_explicit_refs" to additionally
> follow the configured remote tracking ref globbing patterns.
>
> Because
>
>  (1) the old patch was never tested in a production context (I don't think
>     it even hit 'pu');
>
>  (2) I offhand do not know how much the codebase changed in the area that
>     would affect the assumptions the patch made back then; and
>
>  (3) we will be in feature freeze for 1.7.2 anyway;
>
> I would rather not be the one who is forward-porting the patch myself
> if I can avoid it, however.
>
> I could queue a version of the patch (with updates if necessary) to 'pu',
> but not much more than that right now.
>
>

Thank you, Junio, for the update.

Eugene

  reply	other threads:[~2010-06-29 20:05 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-07 17:03 origin/branchname and tracking branch pointing to different commits? Eugene Sajine
2010-01-07 17:06 ` Matthieu Moy
2010-01-07 17:12 ` Thomas Rast
2010-01-07 17:25   ` Eugene Sajine
2010-01-07 23:50     ` Eugene Sajine
2010-01-08  0:32       ` Junio C Hamano
2010-06-08 16:27         ` Eugene Sajine
2010-06-08 17:25           ` Junio C Hamano
2010-06-08 17:50             ` Eugene Sajine
2010-06-08 18:30           ` Jeff King
2010-06-28 17:43             ` Eugene Sajine
2010-06-29 19:27               ` Junio C Hamano
2010-06-29 20:05                 ` Eugene Sajine [this message]
2010-06-29 22:39                 ` Jeff King

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=AANLkTik61QMnAn7rEoIOHlCMAuWgpdXWvmGVLCTn9YD1@mail.gmail.com \
    --to=euguess@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    --cc=trast@student.ethz.ch \
    /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).