summaryrefslogtreecommitdiff
path: root/git-difftool--helper.sh
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2010-01-15 14:03:44 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-15 15:04:45 -0800
commit9f3d54d193d9edcf443c9dd62789af5e8e47635c (patch)
tree0e774da7ac3481fb9de4e9178bb90fca2101c960 /git-difftool--helper.sh
parentf47f1e2ce8b4022113120b32decb4436341dc3aa (diff)
downloadgit-9f3d54d193d9edcf443c9dd62789af5e8e47635c.tar.gz
difftool: Use eval to expand '--extcmd' expressions
It was not possible to pass quoted commands to '--extcmd'. By using 'eval' we ensure that expressions with spaces and quotes are supported. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-difftool--helper.sh')
-rwxr-xr-xgit-difftool--helper.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index d806eaef54..69f6bcebcb 100755
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -48,11 +48,10 @@ launch_merge_tool () {
fi
if use_ext_cmd; then
- $GIT_DIFFTOOL_EXTCMD "$LOCAL" "$REMOTE"
+ eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
else
run_merge_tool "$merge_tool"
fi
-
}
if ! use_ext_cmd; then