From: David Aguilar Date: Thu, 16 Oct 2014 04:45:14 GMT Subject: [PATCH v2] mergetools/meld: make usage of `--output` configurable and more robust Message-ID: <1413434714-20424-1-git-send-email-davvid@gmail.com> In-Reply-To: Older versions of meld listed --output in `meld --help`. Newer versions only mention `meld [OPTIONS...]`. Improve the checks to catch these newer versions. Add a `mergetool.meld.hasOutput` configuration to allow overriding the heuristic. Reported-by: Andrey Novoseltsev Helped-by: Junio C Hamano Signed-off-by: David Aguilar --- Changes since v1: This uses Junio's improved approach of checking for both --help styles and uses more focused name for the configuration variable. The documentation was reworded accordingly. Documentation/config.txt | 9 +++++++++ mergetools/meld | 9 +++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 04a1e2f..0f823eb 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1755,6 +1755,15 @@ mergetool..trustExitCode:: if the file has been updated, otherwise the user is prompted to indicate the success of the merge. +mergetool.meld.hasOutput:: + Older versions of `meld` do not support the `--output` option. + Git will attempt to detect whether `meld` supports `--output` + by inspecting the output of `meld --help`. Configuring + `mergetool.meld.hasOutput` will make Git skip these checks and + use the configured value instead. Setting `mergetool.meld.hasOutput` + to `true` tells Git to unconditionally use the `--output` option, + and `false` avoids using `--output`. + mergetool.keepBackup:: After performing a merge, the original file with conflict markers can be saved as a file with a `.orig` extension. If this variable diff --git a/mergetools/meld b/mergetools/meld index cb672a5..83ebdfb 100644 --- a/mergetools/meld +++ b/mergetools/meld @@ -18,13 +18,18 @@ merge_cmd () { check_unchanged } -# Check whether 'meld --output ' is supported +# Check whether we should use 'meld --output ' 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 + if meld_has_output_option=$(git config --bool mergetool.meld.hasOutput) then + : use configured value + elif "$meld_path" --help 2>&1 | + grep -e '--output=' -e '\[OPTION\.\.\.\]' >/dev/null + then + : old ones mention --output and new ones just say OPTION... meld_has_output_option=true else meld_has_output_option=false -- 2.1.2.444.g0cfad43