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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Oct 30, 2018 at 02:22 UTC
665177ebf2e948504dcb255d2f58817224a8935a
1 file changed
+1
-1
t/t7800-difftool.sh
+1
-1
@@ -332,7 +332,7 @@ test_expect_success 'difftool --extcmd cat arg1' '
332
test_expect_success 'difftool --extcmd cat arg2' '
333
echo branch >expect &&
334
git difftool --no-prompt \
335
- --extcmd sh\ -c\ \"cat\ \$2\" branch >actual &&
335
+ --extcmd sh\ -c\ \"cat\ \\\"\$2\\\"\" branch >actual &&
336
test_cmp expect actual
337
'
338