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>
Michael J Gruber committed
Jun 19, 2015 at 11:30 UTC
f67986b9098c21005f33182472a990d5c6e8a98d
1 file changed
+1
git-mergetool--lib.sh
+1
@@ -305,6 +305,7 @@ guess_merge_tool () {
305
EOF
306
307
# Loop over each candidate and stop when a valid merge tool is found.
308
+ IFS=' '
309
for tool in $tools
310
do
311
is_available "$tool" && echo "$tool" && return 0