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

Re: linux-next: unneeded merge in the security tree

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 12, 2013, 21:47 UTC
Message-ID
<7vppz45lz9.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CA+55aFwHJtOU4Qzt3XZsER165kTc5P0ATQP2wPHvuUiVic8bnA@mail.gmail.com>
Linus Torvalds <torvalds@linux-foundation.org> writes:
Show 5 quoted lines
>  - I do think that we might want a "--no-signatures" for the specific
> case of merging signed tags without actually taking the signature
> (because it's a "upstream" repo). The "--ff-only" thing is *too*
> strict. Sometimes you really do want to merge in new code, disallowing
> it entirely is tough.

I agree that "--ff-only" thing is too strict and sometimes you would want to allow back-merges, but when you do allow such a back-merge, is there a reason you want it to be --no-signatures merge? When a subtree maintainer decides to merge a stable release point from you with a good reason, I do not see anything wrong in recording that the resulting commit _did_ merge what you released with a signature.

Previous: Linus TorvaldsNext: Linus Torvalds
Message 7 of 12 in “Re: linux-next: unneeded merge in the security tree”
  1. Linus TorvaldsMar 12, 2013
  2. Geert UytterhoevenMar 12, 2013
  3. Junio C HamanoMar 12, 2013
  4. Junio C HamanoMar 12, 2013
  5. Theodore Ts'oMar 12, 2013
  6. Linus TorvaldsMar 12, 2013
  7. Junio C HamanoMar 12, 2013
  8. Linus TorvaldsMar 12, 2013
  9. Junio C HamanoMar 12, 2013
  10. Junio C HamanoMar 12, 2013
  11. Theodore Ts'oMar 13, 2013
  12. Junio C HamanoMar 13, 2013

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.