2 # git-difftool--helper is a GIT_EXTERNAL_DIFF-compatible diff tool launcher.
3 # This script is typically launched by using the 'git difftool'
6 # Copyright (c) 2009, 2010 David Aguilar
11 # difftool.prompt controls the default prompt/no-prompt behavior
12 # and is overridden with $GIT_DIFFTOOL*_PROMPT.
14 prompt_merge
=$
(git config
--bool mergetool.prompt ||
echo true
)
15 prompt
=$
(git config
--bool difftool.prompt ||
echo $prompt_merge)
16 if test "$prompt" = true
18 test -z "$GIT_DIFFTOOL_NO_PROMPT"
20 test -n "$GIT_DIFFTOOL_PROMPT"
24 # Indicates that --extcmd=... was specified
26 test -n "$GIT_DIFFTOOL_EXTCMD"
29 launch_merge_tool
() {
30 # Merged is the filename as it appears in the work tree
31 # Local is the contents of a/filename
32 # Remote is the contents of b/filename
33 # Custom merge tool commands might use $BASE so we provide it
39 # $LOCAL and $REMOTE are temporary files so prompt
40 # the user with the real $MERGED name before launching $merge_tool.
43 printf "\nViewing: '%s'\n" "$MERGED"
46 printf "Launch '%s' [Y/n]: " \
47 "$GIT_DIFFTOOL_EXTCMD"
49 printf "Launch '%s' [Y/n]: " "$merge_tool"
51 if read ans
&& test "$ans" = n
60 eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
62 run_merge_tool
"$merge_tool"
68 if test -n "$GIT_DIFF_TOOL"
70 merge_tool
="$GIT_DIFF_TOOL"
72 merge_tool
="$(get_merge_tool)" ||
exit
76 if test -n "$GIT_DIFFTOOL_DIRDIFF"
80 run_merge_tool
"$merge_tool" false
82 # Launch the merge tool on each path provided by 'git diff'
85 launch_merge_tool
"$1" "$2" "$5"