From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Fri, 19 Jun 2015 09:30:55 +0000 (+0200)
Subject: mergetool-lib: fix default tool selection
X-Git-Tag: v2.5.0-rc1~4^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f67986b9098c21005f33182472a990d5c6e8a98d;p=thirdparty%2Fgit.git

mergetool-lib: fix default tool selection

When no diff nor merge tool is specified (config, option), mergetool-lib
is supposed to choose a default tool from a set of tools. That set is
constructed dynamically depending on the environment (graphical, editor
setting) as a space separated string of tool names.

719518f (mergetool--lib: set IFS for difftool and mergetool, 2015-05-20)
introduced a newline as IFS which breaks the parsing of the space
separated list into items, resulting in a failed search for an available
tool.

Set IFS to a space locally for the tool search.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 14b039de65..54ac8e4846 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -305,6 +305,7 @@ guess_merge_tool () {
 	EOF
 
 	# Loop over each candidate and stop when a valid merge tool is found.
+	IFS=' '
 	for tool in $tools
 	do
 		is_available "$tool" && echo "$tool" && return 0