mirror of
https://github.com/git/git.git
synced 2024-05-19 07:06:09 +02:00
759a904e09
In v1.7.7-rc0~3^2 (2011-08-19), git mergetool's "meld" support learned to use the --output option when calling versions of meld that are detected to support it (1.5.0 and newer, hopefully). Alas, it misdetects old versions (before 1.1.5, 2006-06-11) of meld as supporting the option, so on systems with such meld, instead of getting a nice merge helper, the operator gets a dialog box with the text "Wrong number of arguments (Got 5)". (Version 1.1.5 is when meld switched to using optparse. One consequence of that change was that errors in usage are detected and signalled through the exit status even when --help was passed.) Luckily there is a simpler check that is more reliable: the usage string printed by "meld --help" reliably reflects whether --output is supported in a given version. Use it. Reported-by: Jeff Epler <jepler@unpythonic.net> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
33 lines
680 B
Plaintext
33 lines
680 B
Plaintext
diff_cmd () {
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
|
}
|
|
|
|
merge_cmd () {
|
|
if test -z "${meld_has_output_option:+set}"
|
|
then
|
|
check_meld_for_output_version
|
|
fi
|
|
touch "$BACKUP"
|
|
if test "$meld_has_output_option" = true
|
|
then
|
|
"$merge_tool_path" --output "$MERGED" \
|
|
"$LOCAL" "$BASE" "$REMOTE"
|
|
else
|
|
"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
|
|
fi
|
|
check_unchanged
|
|
}
|
|
|
|
# Check whether 'meld --output <file>' is supported
|
|
check_meld_for_output_version () {
|
|
meld_path="$(git config mergetool.meld.path)"
|
|
meld_path="${meld_path:-meld}"
|
|
|
|
if "$meld_path" --help 2>&1 | grep -e --output >/dev/null
|
|
then
|
|
meld_has_output_option=true
|
|
else
|
|
meld_has_output_option=false
|
|
fi
|
|
}
|