[PATCHv2] git mergetool: Don't repeat merge tool candidates
From: Johannes Gilger <hidden>
Date: 2016-06-15 22:46:00
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCHv2] git mergetool: Don't repeat merge tool candidates · Junio C Hamano <hidden>
git mergetool listed some candidates for mergetools twice, depending on the environment. Signed-off-by: Johannes Gilger <redacted> --- The first patch had the fatal flaw that it listed nothing when DISPLAY and EDITOR/VISUAL were unset, we fixed that. The order in which merge-candidates appear is still exactly the same, only duplicates have been stripped. The check for KDE_FULL_SESSION was removed since kdiff3 was added as long as DISPLAY was set and we weren't running gnome. git-mergetool.sh | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 00e1337..acdcffb 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh@@ -390,21 +390,21 @@ fi if test -z "$merge_tool" ; then if test -n "$DISPLAY"; then - merge_tool_candidates="kdiff3 tkdiff xxdiff meld gvimdiff" if test -n "$GNOME_DESKTOP_SESSION_ID" ; then - merge_tool_candidates="meld $merge_tool_candidates" - fi - if test "$KDE_FULL_SESSION" = "true"; then - merge_tool_candidates="kdiff3 $merge_tool_candidates" + merge_tool_candidates="meld kdiff3 tkdiff xxdiff gvimdiff" + else + merge_tool_candidates="kdiff3 tkdiff xxdiff meld gvimdiff" fi fi if echo "${VISUAL:-$EDITOR}" | grep 'emacs' > /dev/null 2>&1; then - merge_tool_candidates="$merge_tool_candidates emerge" + merge_tool_candidates="$merge_tool_candidates emerge opendiff vimdiff" fi if echo "${VISUAL:-$EDITOR}" | grep 'vim' > /dev/null 2>&1; then - merge_tool_candidates="$merge_tool_candidates vimdiff" + merge_tool_candidates="$merge_tool_candidates vimdiff opendiff emerge" + fi + if test -z "$merge_tool_candidates" ; then + merge_tool_candidates="opendiff emerge vimdiff" fi - merge_tool_candidates="$merge_tool_candidates opendiff emerge vimdiff" echo "merge tool candidates: $merge_tool_candidates" for i in $merge_tool_candidates; do init_merge_tool_path $i
--
1.6.1.40.g8ea6a