imap-send: support subjectAltName as well
[git/jnareb-git.git] / git-difftool--helper.sh
blob0594bf7ca54c6b91d5f96dd86d8962e93459d004
1 #!/bin/sh
2 # git-difftool--helper is a GIT_EXTERNAL_DIFF-compatible diff tool launcher.
3 # This script is typically launched by using the 'git difftool'
4 # convenience command.
6 # Copyright (c) 2009, 2010 David Aguilar
8 TOOL_MODE=diff
9 . git-mergetool--lib
11 # difftool.prompt controls the default prompt/no-prompt behavior
12 # and is overridden with $GIT_DIFFTOOL*_PROMPT.
13 should_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; then
17 test -z "$GIT_DIFFTOOL_NO_PROMPT"
18 else
19 test -n "$GIT_DIFFTOOL_PROMPT"
23 # Indicates that --extcmd=... was specified
24 use_ext_cmd () {
25 test -n "$GIT_DIFFTOOL_EXTCMD"
28 launch_merge_tool () {
29 # Merged is the filename as it appears in the work tree
30 # Local is the contents of a/filename
31 # Remote is the contents of b/filename
32 # Custom merge tool commands might use $BASE so we provide it
33 MERGED="$1"
34 LOCAL="$2"
35 REMOTE="$3"
36 BASE="$1"
38 # $LOCAL and $REMOTE are temporary files so prompt
39 # the user with the real $MERGED name before launching $merge_tool.
40 if should_prompt; then
41 printf "\nViewing: '$MERGED'\n"
42 if use_ext_cmd; then
43 printf "Hit return to launch '%s': " \
44 "$GIT_DIFFTOOL_EXTCMD"
45 else
46 printf "Hit return to launch '%s': " "$merge_tool"
48 read ans
51 if use_ext_cmd; then
52 export BASE
53 eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
54 else
55 run_merge_tool "$merge_tool"
59 if ! use_ext_cmd; then
60 if test -n "$GIT_DIFF_TOOL"; then
61 merge_tool="$GIT_DIFF_TOOL"
62 else
63 merge_tool="$(get_merge_tool)" || exit
67 # Launch the merge tool on each path provided by 'git diff'
68 while test $# -gt 6
70 launch_merge_tool "$1" "$2" "$5"
71 shift 7
72 done