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

Re: Signed tags in octopus merge..

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 16, 2012, 22:49 UTC
Message-ID
<7vobu3uusw.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CA+55aFzRN2F5PZDZPRmbj9occZwA6E6Pi+S+M_Qq2EfS6sctyA@mail.gmail.com>
Linus Torvalds <torvalds@linux-foundation.org> writes:
Show 8 quoted lines
> Just a heads-up and congrats: octopus merges of signed tags work well,
> and did exactly the RightThing(tm), both at merge time and with
> "--show-signature".
>
> I knew it was supposed to work, but I have to admit that I was a bit
> apprehensive about it when I tried.
>
> Current top-of-head (commit 81d48f0aee54) in the kernel, in case you care.

I looked at it again, and it makes me wonder if we should further reword it to say "side branch #1, tagged 'devicetree-for-linus'" instead of the current "parent #2, tagged 'devicetree-for-linus'". It looks very weird to start counting from #2, when we know we will never show #1 there.

Previous: Junio C HamanoNext: Jacob Helwig
Message 3 of 6 in “Signed tags in octopus merge..”
  1. Linus TorvaldsJan 14, 2012
  2. Junio C HamanoJan 15, 2012
  3. Junio C HamanoJan 16, 2012
  4. Jacob HelwigJan 16, 2012
  5. Linus TorvaldsJan 16, 2012
  6. Junio C HamanoJan 17, 2012

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.