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

Re: [PATCH 1/2] mergetool: Accept -g/--[no-]gui as arguments

From
Denton Liu <liu.denton@gmail.com>
Date
Oct 24, 2018, 05:30 UTC
Message-ID
<20181024053021.GA14408@archbookpro.localdomain>
In-Reply-To
<xmqqy3aond55.fsf@gitster-ct.c.googlers.com>
On Wed, Oct 24, 2018 at 02:10:14PM +0900, Junio C Hamano wrote:
> In mode_ok shell function, we seem to be prepared to deal with a
> case where neither diff_mode nor merge_mode is true.  Should this
> codepath also be prepared to?  
> 
According to Documentation/git-mergetool--lib.txt,
>Before sourcing 'git-mergetool{litdd}lib', your script must set `TOOL_MODE`
>to define the operation mode for the functions listed below.
>'diff' and 'merge' are valid values.

so I think that we can assume that the one of diff_mode or merge_mode will return true. In any case, it seems like the rest of the code was written under this assumption so if this needs to be changed then the whole library needs to be fixed as well.

Previous: Junio C HamanoNext: David Aguilar
Message 3 of 15 in “mergetool: Accept -g/--[no-]gui as arguments”
  1. 1/2 mergetool: Accept -g/--[no-]gui as argumentsDenton Liu, Oct 24, 2018
  2. Junio C HamanoOct 24, 2018
  3. Denton LiuOct 24, 2018
  4. David AguilarOct 24, 2018
  5. 1/2 mergetool: accept -g/--[no-]gui as argumentsDenton Liu, Oct 24, 2018
  6. 0/3 Add --gui to mergetoolDenton Liu, Oct 24, 2018
  7. 1/3 mergetool: accept -g/--[no-]gui as argumentsDenton Liu, Oct 24, 2018
  8. 2/3 completion: support `git mergetool --[no-]gui`Denton Liu, Oct 24, 2018
  9. 3/3 doc: document diff/merge.guitool config keysDenton Liu, Oct 24, 2018
  10. 0/3 Add --gui to mergetoolDenton Liu, Oct 26, 2018
  11. Junio C HamanoOct 26, 2018
  12. 1/3 mergetool: accept -g/--[no-]gui as argumentsDenton Liu, Oct 26, 2018
  13. 2/3 completion: support `git mergetool --[no-]gui`Denton Liu, Oct 26, 2018
  14. 3/3 doc: document diff/merge.guitool config keysDenton Liu, Oct 26, 2018
  15. 2/2 completion: support `git mergetool --[no-]gui`Denton Liu, Oct 24, 2018

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.