difftool--helper: Remove use of the GIT_MERGE_TOOL variable
[git/git.git] / git-difftool--helper.sh
CommitLineData
5c38ea31 1#!/bin/sh
afcbc8e7 2# git-difftool--helper is a GIT_EXTERNAL_DIFF-compatible diff tool launcher.
5c38ea31
DA
3# This script is typically launched by using the 'git difftool'
4# convenience command.
5#
db367136 6# Copyright (c) 2009-2010 David Aguilar
5c38ea31 7
21d0ba7e
DA
8TOOL_MODE=diff
9. git-mergetool--lib
10
a904392e
DA
11# difftool.prompt controls the default prompt/no-prompt behavior
12# and is overridden with $GIT_DIFFTOOL*_PROMPT.
5c38ea31 13should_prompt () {
a904392e
DA
14 prompt=$(git config --bool difftool.prompt || echo true)
15 if test "$prompt" = true; then
16 test -z "$GIT_DIFFTOOL_NO_PROMPT"
17 else
18 test -n "$GIT_DIFFTOOL_PROMPT"
19 fi
5c38ea31
DA
20}
21
5c38ea31
DA
22launch_merge_tool () {
23 # Merged is the filename as it appears in the work tree
24 # Local is the contents of a/filename
25 # Remote is the contents of b/filename
26 # Custom merge tool commands might use $BASE so we provide it
27 MERGED="$1"
28 LOCAL="$2"
29 REMOTE="$3"
30 BASE="$1"
5c38ea31
DA
31
32 # $LOCAL and $REMOTE are temporary files so prompt
33 # the user with the real $MERGED name before launching $merge_tool.
34 if should_prompt; then
35 printf "\nViewing: '$MERGED'\n"
36 printf "Hit return to launch '%s': " "$merge_tool"
37 read ans
38 fi
39
21d0ba7e 40 run_merge_tool "$merge_tool"
5c38ea31
DA
41}
42
61ed71dc
DA
43# GIT_DIFF_TOOL indicates that --tool=... was specified
44if test -n "$GIT_DIFF_TOOL"; then
45 merge_tool="$GIT_DIFF_TOOL"
46else
47d65924
DA
47 merge_tool="$(get_merge_tool)" || exit
48fi
5c38ea31
DA
49
50# Launch the merge tool on each path provided by 'git diff'
51while test $# -gt 6
52do
53 launch_merge_tool "$1" "$2" "$5"
54 shift 7
55done