From: Johannes Schindelin Date: Tue, 30 Oct 2018 09:22:29 +0000 (-0700) Subject: t7800: fix quoting X-Git-Tag: v2.20.0-rc0~49^2~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/665177ebf2e948504dcb255d2f58817224a8935a?ds=inline;hp=--cc t7800: fix quoting When passing a command-line to call an external diff command to the difftool, we must be prepared for paths containing special characters, e.g. backslashes in the temporary directory's path on Windows. This patch is needed in preparation for the next commit, which will make the MinGW version of Git *not* rewrite TMP to use forward slashes instead of backslashes. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- 665177ebf2e948504dcb255d2f58817224a8935a diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 668bbee73c..f29aa8f344 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -332,7 +332,7 @@ test_expect_success 'difftool --extcmd cat arg1' ' test_expect_success 'difftool --extcmd cat arg2' ' echo branch >expect && git difftool --no-prompt \ - --extcmd sh\ -c\ \"cat\ \$2\" branch >actual && + --extcmd sh\ -c\ \"cat\ \\\"\$2\\\"\" branch >actual && test_cmp expect actual '