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

Re: git merge <tag>: Spawning an editor can't be disabled

From
Johannes Sixt <j6t@kdbg.org>
Date
Feb 9, 2012, 18:50 UTC
Message-ID
<4F34158D.3030903@kdbg.org>
In-Reply-To
<7vzkcrx4f2.fsf@alter.siamese.dyndns.org>
Am 09.02.2012 19:11, schrieb Junio C Hamano:
Show 6 quoted lines
> If the editor is not spawned, there is no way for the user to review the
> result of signature verification before deciding to accept the merge.
> "git merge --no-edit v1.7.2" could error out saying "you cannot create
> this merge without reviewing".  Or it could behave as if it was asked to
> "git merge --no-edit v1.7.2^0", dropping the signature verification and
> recording part altogether.

It should behave as if the editor was spawned and the user did not change the content of the commit message.

Use case: First, you merge ordinarily, that is, you review the signature and the contents, and you are satisfied. Shortly later, you discover that a fix should be applied before the merge. So you rewind the branch before the merge, and commit the fix. Now you can repeat the merge with --no-edit because you have already seen the contents.

Contrived? Dunno.
-- Hannes
Previous: Junio C HamanoNext: Junio C Hamano
Message 3 of 7 in “Re: git merge <tag>: Spawning an editor can't be disabled”
  1. Jonathan NiederFeb 9, 2012
  2. Junio C HamanoFeb 9, 2012
  3. Johannes SixtFeb 9, 2012
  4. Junio C HamanoFeb 9, 2012
  5. Jonathan NiederFeb 9, 2012
  6. Junio C HamanoFeb 9, 2012
  7. Junio C HamanoFeb 9, 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.