| commit | f67986b9098c21005f33182472a990d5c6e8a98d | |
| author | Michael J Gruber <git@drmicha.warpmail.net> | |
| Fri, 19 Jun 2015 09:30:55 +0000 (19 11:30 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 19 Jun 2015 18:20:52 +0000 (19 11:20 -0700) | ||
| tree | 4577b8ebd847ceb347313326c5ecbd89138aeff0 | treesnapshot (tar.gz zip) |
| parent | 3e4f2373b295e19dbc1a6bd0e743f65b500b7bda | commitdiff |
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>
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>
| git-mergetool--lib.sh | diffblobblamehistory |