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

Re: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull".

From
Jeff King <peff@peff.net>
Date
Feb 4, 2007, 01:49 UTC
Message-ID
<20070204014945.GA18357@coredump.intra.peff.net>
In-Reply-To
<7v8xfe3kwo.fsf@assigned-by-dhcp.cox.net>
On Sat, Feb 03, 2007 at 03:01:59PM -0800, Junio C Hamano wrote:
Show 9 quoted lines
> > Since branch.*.merge accept local ref names, there is probably far
> > more to change that what I initially feared.
> 
> If that is the case maybe we should fix branch.*.merge not to
> match the local tracking branch name.  Matching it with local
> tracking branch name when the remote name does not match was
> werely a fallback to help broken configurations confused people
> might create by hand, and has never been the part of sane
> practice at all.
I was one of the major pushers of this feature in December; however, I
think it actually can create some confusing results. See:
  http://article.gmane.org/gmane.comp.version-control.git/35789

I still think it is worth pursuing, but I have been waiting for v1.5.0 to happen before stirring up more trouble. Regardless, I think this implementation is not the right way to go about it, and you should revert 80c79776.

-Peff
Previous: Yann DirsonNext: Junio C Hamano
Message 13 of 21 in “Update to stgit parent tracking”
  1. 0/3 Update to stgit parent trackingYann Dirson, Feb 1, 2007
  2. 1/3 The user does not want to mess with the refspecs.Yann Dirson, Feb 1, 2007
  3. 2/3 Rebase to parent branch after git-fetch in "stg pull".Yann Dirson, Feb 1, 2007
  4. Catalin MarinasFeb 2, 2007
  5. Yann DirsonFeb 2, 2007
  6. Yann DirsonFeb 2, 2007
  7. Catalin MarinasFeb 2, 2007
  8. Catalin MarinasFeb 2, 2007
  9. Yann DirsonFeb 3, 2007
  10. Junio C HamanoFeb 3, 2007
  11. Junio C HamanoFeb 4, 2007
  12. Yann DirsonFeb 4, 2007
  13. Jeff KingFeb 4, 2007
  14. Junio C HamanoFeb 4, 2007
  15. Jeff KingFeb 4, 2007
  16. git-clone wrongly setting branch.*.merge ? (Was: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull".)Yann Dirson, Feb 2, 2007
  17. Yann DirsonFeb 3, 2007
  18. Jakub NarebskiFeb 3, 2007
  19. Catalin MarinasFeb 3, 2007
  20. Yann DirsonFeb 3, 2007
  21. 3/3 Do not return 'origin' as parent remote when there is no such remote.Yann Dirson, Feb 1, 2007

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.