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
=$
(git config
--bool difftool.prompt ||
echo true
)
15 if test "$prompt" = true
; then
16 test -z "$GIT_DIFFTOOL_NO_PROMPT"
18 test -n "$GIT_DIFFTOOL_PROMPT"
22 # Indicates that --extcmd=... was specified
24 test -n "$GIT_DIFFTOOL_EXTCMD"
27 launch_merge_tool
() {
28 # Merged is the filename as it appears in the work tree
29 # Local is the contents of a/filename
30 # Remote is the contents of b/filename
31 # Custom merge tool commands might use $BASE so we provide it
37 # $LOCAL and $REMOTE are temporary files so prompt
38 # the user with the real $MERGED name before launching $merge_tool.
39 if should_prompt
; then
40 printf "\nViewing: '$MERGED'\n"
42 printf "Hit return to launch '%s': " \
43 "$GIT_DIFFTOOL_EXTCMD"
45 printf "Hit return to launch '%s': " "$merge_tool"
51 eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
53 run_merge_tool
"$merge_tool"
57 if ! use_ext_cmd
; then
58 if test -n "$GIT_DIFF_TOOL"; then
59 merge_tool
="$GIT_DIFF_TOOL"
61 merge_tool
="$(get_merge_tool)" ||
exit
65 # Launch the merge tool on each path provided by 'git diff'
68 launch_merge_tool
"$1" "$2" "$5"