diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-13 13:37:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 13:37:21 (GMT) |
| commit | 0474cd19ef55c02d026e9a5b75c086bf8afbad40 (patch) | |
| tree | 0bbf5012dcd7137175dcdb0396ba2837b07f87d1 /t | |
| parent | 6c268fdda9dcc421e2bee1ce76496d3e9f96397f (diff) | |
| parent | fe21c6b285df4088f9685d5deed425064367ea24 (diff) | |
| download | git-0474cd19ef55c02d026e9a5b75c086bf8afbad40.zip git-0474cd19ef55c02d026e9a5b75c086bf8afbad40.tar.gz git-0474cd19ef55c02d026e9a5b75c086bf8afbad40.tar.bz2 | |
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 562bd21..22b9199 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 ' |