diff options
| author | David Aguilar <davvid@gmail.com> | 2010-01-15 23:03:44 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-16 00:04:45 +0100 |
| commit | 9f3d54d193d9edcf443c9dd62789af5e8e47635c (patch) | |
| tree | 0e774da7ac3481fb9de4e9178bb90fca2101c960 /git-difftool--helper.sh | |
| parent | difftool: Add '-x' and as an alias for '--extcmd' (diff) | |
| download | git-9f3d54d193d9edcf443c9dd62789af5e8e47635c.tar.xz git-9f3d54d193d9edcf443c9dd62789af5e8e47635c.zip | |
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-x | git-difftool--helper.sh | 3 |
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 |