diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-13 22:37:21 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 22:37:21 +0900 |
| commit | 0474cd19ef55c02d026e9a5b75c086bf8afbad40 (patch) | |
| tree | 0bbf5012dcd7137175dcdb0396ba2837b07f87d1 /t | |
| parent | Merge branch 'js/mingw-perl5lib' (diff) | |
| parent | mingw: reencode environment variables on the fly (UTF-16 <-> UTF-8) (diff) | |
| download | tgif-0474cd19ef55c02d026e9a5b75c086bf8afbad40.tar.xz | |
Merge branch 'js/mingw-utf8-env'
Windows fix.
* js/mingw-utf8-env:
mingw: reencode environment variables on the fly (UTF-16 <-> UTF-8)
t7800: fix quoting
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7800-difftool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 562bd215a5..22b9199d59 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 ' |