undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mergetool--lib: improve show_tool_help() output

Browse Source 
Check the can_diff and can_merge functions before deciding whether
to add the tool to the available/unavailable lists.  This makes
"--tool-help" context-sensitive so that "git mergetool --tool-help"
displays merge tools only and "git difftool --tool-help" displays
diff tools only.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
David Aguilar 2013-01-25 01:43:54 -08:00 committed by Junio C Hamano
parent b2a6b7122e
commit 88d3406ad7
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
git-mergetool--lib.sh
View File

@ -175,17 +175,33 @@ list_merge_tool_candidates () {
}
show_tool_help () {
list_merge_tool_candidates
unavailable= available= LF='
'
for i in $tools
scriptlets="$(git --exec-path)"/mergetools
for i in "$scriptlets"/*
do
merge_tool_path=$(translate_merge_tool_path "$i")
. "$scriptlets"/defaults
. "$i"
tool="$(basename "$i")"
if test "$tool" = "defaults"
then
continue
elif merge_mode && ! can_merge
then
continue
elif diff_mode && ! can_diff
then
continue
fi
merge_tool_path=$(translate_merge_tool_path "$tool")
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