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

Re: [PATCH 7/7] mergetool--lib: Improve show_tool_help() output

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 25, 2013, 20:16 UTC
Message-ID
<7vpq0t2f2t.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20130125200807.GB7498@serenity.lan>
John Keeping <john@keeping.me.uk> writes:
Show 8 quoted lines
> Actually, can we just change all of the above part of the loop to:
>
> 	test "$tool" = defaults && continue
>
> 	merge_tool_path=$(
> 		setup_tool "$tool" >/dev/null 2>&1 &&
> 		translate_merge_tool_path "$tool"
> 	) || continue

Meaning "setup_tool ought to know which mode we are in and should fail if we are in merge mode and it does not support merging"? That line of reasoning makes tons of sense to me, compared to this script implementing that logic for these scriptlets.

How/when does translate_merge_tool_path fail?
Show 14 quoted lines
>
>> >  		if type "$merge_tool_path" >/dev/null 2>&1
>> >  		then
>> > -			available="$available$i$LF"
>> > +			available="$available$tool$LF"
>> >  		else
>> > -			unavailable="$unavailable$i$LF"
>> > +			unavailable="$unavailable$tool$LF"
>> >  		fi
>> >  	done
>> --
>> To unsubscribe from this list: send the line "unsubscribe git" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous: John KeepingNext: John Keeping
Message 19 of 30 in “mergetool-lib improvements for --tool-help”
  1. 0/7 mergetool-lib improvements for --tool-helpDavid Aguilar, Jan 25, 2013
  2. 1/7 git-mergetool: move show_tool_help to mergetool--libDavid Aguilar, Jan 25, 2013
  3. 2/7 git-mergetool: remove redundant assignmentDavid Aguilar, Jan 25, 2013
  4. 3/7 git-mergetool: don't hardcode 'mergetool' in show_tool_helpDavid Aguilar, Jan 25, 2013
  5. 4/7 git-difftool: use git-mergetool--lib for "--tool-help"David Aguilar, Jan 25, 2013
  6. 5/7 mergetools/vim: Remove redundant diff commandDavid Aguilar, Jan 25, 2013
  7. 6/7 mergetools: Fix difftool/mergetool --tool-help listing for vimDavid Aguilar, Jan 25, 2013
  8. Sebastian SchuberthJan 25, 2013
  9. David AguilarJan 25, 2013
  10. Sebastian SchuberthJan 25, 2013
  11. Sebastian SchuberthJan 25, 2013
  12. John KeepingJan 25, 2013
  13. David AguilarJan 25, 2013
  14. Junio C HamanoJan 25, 2013
  15. 7/7 mergetool--lib: Improve show_tool_help() outputDavid Aguilar, Jan 25, 2013
  16. John KeepingJan 25, 2013
  17. Junio C HamanoJan 25, 2013
  18. John KeepingJan 25, 2013
  19. Junio C HamanoJan 25, 2013
  20. John KeepingJan 25, 2013
  21. Junio C HamanoJan 25, 2013
  22. John KeepingJan 25, 2013
  23. Junio C HamanoJan 25, 2013
  24. John KeepingJan 25, 2013
  25. 8/7 mergetool--lib: don't call "exit" in setup_toolJohn Keeping, Jan 25, 2013
  26. Junio C HamanoJan 26, 2013
  27. David AguilarJan 26, 2013
  28. 1/2 mergetool--lib: don't call "exit" in setup_toolJohn Keeping, Jan 26, 2013
  29. 1/2 mergetool--lib: don't call "exit" in setup_toolJohn Keeping, Jan 26, 2013
  30. 9/7 mergetool--lib: fix path lookup in guess_merge_toolJohn Keeping, Jan 25, 2013

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.