undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

difftool: Use eval to expand '--extcmd' expressions

Browse Source 
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>
This commit is contained in:
David Aguilar 2010-01-15 14:03:44 -08:00 committed by Junio C Hamano
parent f47f1e2ce8
commit 9f3d54d193
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-difftool--helper.sh
View File

@ -48,11 +48,10 @@ launch_merge_tool () {
fi fi
if use_ext_cmd; then if use_ext_cmd; then
$GIT_DIFFTOOL_EXTCMD "$LOCAL" "$REMOTE" eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
else else
run_merge_tool "$merge_tool" run_merge_tool "$merge_tool"
fi fi
} }
if ! use_ext_cmd; then if ! use_ext_cmd; then

13
t/t7800-difftool.sh
View File

@ -235,8 +235,21 @@ test_expect_success 'difftool --extcmd cat' '
test_expect_success 'difftool -x cat' ' test_expect_success 'difftool -x cat' '
diff=$(git difftool --no-prompt -x cat branch) && diff=$(git difftool --no-prompt -x cat branch) &&
test "$diff" = branch"$LF"master test "$diff" = branch"$LF"master
'
test_expect_success 'difftool --extcmd echo arg1' '
diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"echo\ \$1\" branch)
test "$diff" = file
'
test_expect_success 'difftool --extcmd cat arg1' '
diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"cat\ \$1\" branch)
test "$diff" = master
'
test_expect_success 'difftool --extcmd cat arg2' '
diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"cat\ \$2\" branch)
test "$diff" = branch
' '
test_done test_done