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

Re: origin/branchname and tracking branch pointing to different commits?

From
Jeff King <peff@peff.net>
Date
Jun 29, 2010, 22:39 UTC
Message-ID
<20100629223919.GB5668@sigill.intra.peff.net>
In-Reply-To
<7vocet8ws2.fsf@alter.siamese.dyndns.org>
On Tue, Jun 29, 2010 at 12:27:09PM -0700, Junio C Hamano wrote:
Show 17 quoted lines
> 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 am probably the best person to take another look at it (though I would be fine if somebody else wants to volunteer).

Right now I am in the process of switching day jobs and doing an inter-state move, so it will probably be a month before I have a lot of git time.

-Peff
Previous: Eugene Sajine
Message 14 of 14 in “origin/branchname and tracking branch pointing to different commits?”
  1. Eugene SajineJan 7, 2010
  2. Matthieu MoyJan 7, 2010
  3. Thomas RastJan 7, 2010
  4. Eugene SajineJan 7, 2010
  5. Eugene SajineJan 7, 2010
  6. Junio C HamanoJan 8, 2010
  7. Eugene SajineJun 8, 2010
  8. Junio C HamanoJun 8, 2010
  9. Eugene SajineJun 8, 2010
  10. Jeff KingJun 8, 2010
  11. Eugene SajineJun 28, 2010
  12. Junio C HamanoJun 29, 2010
  13. Eugene SajineJun 29, 2010
  14. Jeff KingJun 29, 2010

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.