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

Re: [PATCH v2 0/5] git-mergetool: improve error code paths and messages

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 26, 2024, 04:33 UTC
Message-ID
<xmqqr06y1umr.fsf@gitster.g>
In-Reply-To
<pull.1827.v2.git.1732305022.gitgitgadget@gmail.com>
"Philippe Blain via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 6 quoted lines
> Changes in v2: As suggested by Junio:
>
>  * 3/5: moved the error message to setup_tool itself, and adjusted the
>    commit message
>  * 3/5: made the test more robust
>  * 4/5: adjusted the error message
I think the above changes all looked good.
Let me mark the topic for 'next'.
Thanks.
Previous: Philippe Blain via GitGitGadget
Message 20 of 20 in “git-mergetool: improve error code paths and messages”
  1. 0/5 git-mergetool: improve error code paths and messagesPhilippe Blain via GitGitGadget, Nov 13, 2024
  2. 1/5 completion: complete '--tool-help' in 'git mergetool'Philippe Blain via GitGitGadget, Nov 13, 2024
  3. 2/5 git-mergetool--lib.sh: use TOOL_MODE when erroring about unknown toolPhilippe Blain via GitGitGadget, Nov 13, 2024
  4. Junio C HamanoNov 13, 2024
  5. Philippe BlainNov 22, 2024
  6. Philippe BlainNov 22, 2024
  7. 3/5 git-mergetool--lib.sh: add error message in 'setup_user_tool'Philippe Blain via GitGitGadget, Nov 13, 2024
  8. Junio C HamanoNov 13, 2024
  9. Philippe BlainNov 22, 2024
  10. 4/5 git-mergetool--lib.sh: add error message for unknown tool variantPhilippe Blain via GitGitGadget, Nov 13, 2024
  11. Junio C HamanoNov 13, 2024
  12. Philippe BlainNov 22, 2024
  13. 5/5 git-difftool--helper.sh: exit upon initialize_merge_tool errorsPhilippe Blain via GitGitGadget, Nov 13, 2024
  14. 0/5 git-mergetool: improve error code paths and messagesPhilippe Blain via GitGitGadget, Nov 22, 2024
  15. 1/5 completion: complete '--tool-help' in 'git mergetool'Philippe Blain via GitGitGadget, Nov 22, 2024
  16. 2/5 git-mergetool--lib.sh: use TOOL_MODE when erroring about unknown toolPhilippe Blain via GitGitGadget, Nov 22, 2024
  17. 3/5 git-mergetool--lib.sh: add error message if 'setup_user_tool' failsPhilippe Blain via GitGitGadget, Nov 22, 2024
  18. 4/5 git-mergetool--lib.sh: add error message for unknown tool variantPhilippe Blain via GitGitGadget, Nov 22, 2024
  19. 5/5 git-difftool--helper.sh: exit upon initialize_merge_tool errorsPhilippe Blain via GitGitGadget, Nov 22, 2024
  20. Junio C HamanoNov 26, 2024

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.