summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2015-05-20 02:07:22 -0700
committerJunio C Hamano <gitster@pobox.com>2015-05-20 13:13:42 -0700
commit719518f5cebba0fb4ed6caf6d92d683e858120f0 (patch)
tree39eaef2c921384d056b0549a6e0296cee73495af
parent3d4a3ffe64162b45ae7c991fc60623ecb4678cfd (diff)
downloadgit-719518f5cebba0fb4ed6caf6d92d683e858120f0.tar.gz
mergetool--lib: set IFS for difftool and mergetool
git-sh-setup sets IFS but it is not used by git-difftool--helper. Set IFS in git-mergetool--lib so that the mergetool scriptlets, difftool, and mergetool do not need to do so. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--git-mergetool--lib.sh3
-rwxr-xr-xgit-mergetool.sh2
2 files changed, 3 insertions, 2 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index fe61e89f31..14b039de65 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -2,6 +2,9 @@
: ${MERGE_TOOLS_DIR=$(git --exec-path)/mergetools}
+IFS='
+'
+
mode_ok () {
if diff_mode
then
diff --git a/git-mergetool.sh b/git-mergetool.sh
index d20581c15c..9f77e3a8bb 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -451,8 +451,6 @@ fi
printf "Merging:\n"
printf "%s\n" "$files"
-IFS='
-'
rc=0
for i in $files
do