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

Re: [PATCH] merge: indicate remote tracking branches in merge message

From
Jeff King <peff@peff.net>
Date
Aug 9, 2009, 07:40 UTC
Message-ID
<20090809074035.GA4778@coredump.intra.peff.net>
In-Reply-To
<7vab29a1fr.fsf@alter.siamese.dyndns.org>
On Sun, Aug 09, 2009 at 12:31:04AM -0700, Junio C Hamano wrote:
> I somewhat suspect that the patch was not applied because it also lacked
> necessary adjustments to tests.  With this patch, I think the tests would
> fail.
Yeah, see my follow-up patch.
Show 5 quoted lines
> Nevertheless, I think it is a good thing to do.  But I am unsure about the
> implementation.
> 
> Shouldn't it instead feed what it got from the end user to the dwim
> machinery, and make sure it dwims into refs/remotes/ hierarchy?

I'm not sure that is all that different in practice than what is happening now. Mainly I did it the way I did so that I didn't touch the code path for detecting local branches.

But assuming they are functionally identical, I think your patch is much more readable.

> In other words, like this.  Note that it would be much clearer to see
> what's needed, if you want to extend it to refs/tags hierarchy ;-)

I'm not sure adding "tag foo" will actually work, as it still has to make it through the bit where we parse FETCH_HEAD. I'm not sure if it would get mutilated to "commit foo" by that code or not.

-Peff
Previous: Junio C HamanoNext: Jeff King
Message 4 of 12 in “merge: indicate remote tracking branches in merge message”
  1. merge: indicate remote tracking branches in merge messageJeff King, Aug 9, 2009
  2. Jeff KingAug 9, 2009
  3. Junio C HamanoAug 9, 2009
  4. Jeff KingAug 9, 2009
  5. Jeff KingAug 9, 2009
  6. Jeff KingAug 9, 2009
  7. 1/3 add tests for merge message headingsJeff King, Aug 9, 2009
  8. 2/3 merge: fix incorrect merge message for ambiguous tag/branchJeff King, Aug 9, 2009
  9. 3/3 merge: indicate remote tracking branches in merge messageJeff King, Aug 9, 2009
  10. Jeff KingAug 9, 2009
  11. Junio C HamanoAug 9, 2009
  12. Jeff KingAug 9, 2009

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.