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

Re: [PATCH v3 10/9] difftool: do not allow mix of '--prompt' with '--no-prompt'

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 21, 2012, 20:14 UTC
Message-ID
<7vehsl1zl0.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1332358560-13774-4-git-send-email-tim.henigan@gmail.com>
Tim Henigan <tim.henigan@gmail.com> writes:
Show 7 quoted lines
> When difftool was changed to use Getopt::Long, it changed the way that
> the '--prompt' and '--no-prompt' options are handled. Prior to the change,
> if both options were given, then the last option was used.  After the
> change, if both were given, then '--prompt' was always used.
>
> This commit teaches difftool to exit with an error if both options are
> given at the command line. t7800 was updated to match.

Hrm, people with "[alias] mdt = difftool --prompt" have every right to expect their

	$ git mdt --no-prompt
to keep working, no?
Previous: Tim HeniganNext: Tim Henigan
Message 5 of 17 in “difftool: teach command to perform directory diffs”
  1. 0/9 difftool: teach command to perform directory diffsTim Henigan, Mar 21, 2012
  2. 7/9 difftool: teach difftool to handle directory diffsTim Henigan, Mar 21, 2012
  3. 8/9 difftool: teach dir-diff to copy modified files back to working treeTim Henigan, Mar 21, 2012
  4. 10/9 difftool: do not allow mix of '--prompt' with '--no-prompt'Tim Henigan, Mar 21, 2012
  5. Junio C HamanoMar 21, 2012
  6. 10/9 difftool: fix regression in '--prompt' optionsTim Henigan, Mar 22, 2012
  7. Junio C HamanoMar 22, 2012
  8. Thomas RastMar 22, 2012
  9. Tim HeniganMar 22, 2012
  10. Junio C HamanoMar 22, 2012
  11. Tim HeniganMar 22, 2012
  12. Junio C HamanoMar 22, 2012
  13. Junio C HamanoMar 22, 2012
  14. 11/9 t7800: add test for difftool --tool-helpTim Henigan, Mar 21, 2012
  15. 12/9 t7800: add tests for difftool --dir-diffTim Henigan, Mar 21, 2012
  16. David AguilarMar 22, 2012
  17. Tim HeniganMar 22, 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.