diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-30 14:21:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-30 14:21:09 -0700 |
| commit | 385e171a5b56dabbe33dbef6f88e8f934a6cacda (patch) | |
| tree | e09faa621121db48522e940556fa7a169f66e730 /t/t4041-diff-submodule-option.sh | |
| parent | 4b0c0e35dd2ebdab3fed1c6649f74787f7e46327 (diff) | |
| parent | baea068d677fae92d7903e984cf93bbd5195a000 (diff) | |
| download | git-385e171a5b56dabbe33dbef6f88e8f934a6cacda.tar.gz | |
Merge branch 'sk/mingw-uni-fix-more'
Most of these are battle-tested in msysgit and are needed to
complete what has been merged to 'master' already.
* sk/mingw-uni-fix-more:
Win32: enable color output in Windows cmd.exe
Win32: patch Windows environment on startup
Win32: keep the environment sorted
Win32: use low-level memory allocation during initialization
Win32: reduce environment array reallocations
Win32: don't copy the environment twice when spawning child processes
Win32: factor out environment block creation
Win32: unify environment function names
Win32: unify environment case-sensitivity
Win32: fix environment memory leaks
Win32: Unicode environment (incoming)
Win32: Unicode environment (outgoing)
Revert "Windows: teach getenv to do a case-sensitive search"
tests: do not pass iso8859-1 encoded parameter
Diffstat (limited to 't/t4041-diff-submodule-option.sh')
| -rwxr-xr-x | t/t4041-diff-submodule-option.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh index 463d63bde0..e4328964a7 100755 --- a/t/t4041-diff-submodule-option.sh +++ b/t/t4041-diff-submodule-option.sh @@ -26,8 +26,10 @@ add_file () { echo "$name" >"$name" && git add "$name" && test_tick && - msg_added_iso88591=$(echo "Add $name ($added $name)" | iconv -f utf-8 -t $test_encoding) && - git -c "i18n.commitEncoding=$test_encoding" commit -m "$msg_added_iso88591" + # "git commit -m" would break MinGW, as Windows refuse to pass + # $test_encoding encoded parameter to git. + echo "Add $name ($added $name)" | iconv -f utf-8 -t $test_encoding | + git -c "i18n.commitEncoding=$test_encoding" commit -F - done >/dev/null && git rev-parse --short --verify HEAD ) |