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

What should mergetool do with --no-prompt?

From
David Aguilar <davvid@gmail.com>
Date
Aug 14, 2012, 07:07 UTC
Message-ID
<CAJDDKr5TK910n603jcmoq6WoaLL9DX9hgwF3Y+MmjngMpAXPQw@mail.gmail.com>

Right now there are two code paths, resolving deletion conflicts and resolving symlink conflicts, in git-mergetool that do not honor --no-prompt. They force user-interaction with the shell even though the caller (such as a program) said that they do not want to be prompted.

This was an oversight from when this option was first added.

I think a simple and sensible thing to do would be for mergetool to skip over these entries when --no-prompt is supplied.

Does this sound like a good idea?
-- 
David
Next: Charles Bailey
Message 1 of 6 in “What should mergetool do with --no-prompt?”
  1. David AguilarAug 14, 2012
  2. Charles BaileyAug 14, 2012
  3. Junio C HamanoAug 14, 2012
  4. Charles BaileyAug 14, 2012
  5. Junio C HamanoAug 14, 2012
  6. David AguilarAug 14, 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.