git, branch v2.11.0-rc1

Git 2.11.0-rc1

2016-11-11T22:04:32Z

Signed-off-by: Junio C Hamano

Merge branch 'rt/fetch-pack-error-message-fix'

2016-11-11T21:56:31Z

An error message in fetch-pack executable that was newly marked for translation was misspelt, which has been fixed. * rt/fetch-pack-error-message-fix: fetch-pack.c: correct command at the beginning of an error message

Merge branch 'ps/common-info-doc'

2016-11-11T21:56:31Z

Doc fix. * ps/common-info-doc: doc: fix location of 'info/' with $GIT_COMMON_DIR

Merge branch 'js/pwd-var-vs-pwd-cmd-fix'

2016-11-11T21:56:30Z

Last minute fixes to two fixups merged to 'master' recently. * js/pwd-var-vs-pwd-cmd-fix: t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variables

Merge branch 'ls/macos-update'

2016-11-11T21:56:30Z

Portability update and workaround for builds on recent Mac OS X. * ls/macos-update: travis-ci: disable GIT_TEST_HTTPD for macOS Makefile: set NO_OPENSSL on macOS by default

Merge branch 'js/prepare-sequencer'

2016-11-11T21:56:30Z

Silence a clang warning introduced by a recently graduated topic. * js/prepare-sequencer: sequencer: silence -Wtautological-constant-out-of-range-compare

Merge branch 'ls/filter-process'

2016-11-11T21:56:30Z

Test portability improvements and optimization for an already-graduated topic. * ls/filter-process: t0021: remove debugging cruft

Merge branch 'as/merge-attr-sleep'

2016-11-11T21:56:30Z

Fix for a racy false-positive test failure. * as/merge-attr-sleep: t6026: clarify the point of "kill $(cat sleep.pid)" t6026: ensure that long-running script really is Revert "t6026-merge-attr: don't fail if sleep exits early" Revert "t6026-merge-attr: ensure that the merge driver was called" t6026-merge-attr: ensure that the merge driver was called t6026-merge-attr: don't fail if sleep exits early

fetch-pack.c: correct command at the beginning of an error message

2016-11-11T21:28:39Z

One error message in fetch-pack.c uses 'git fetch_pack' at the beginning which is not a git command. Use 'git fetch-pack' instead. Signed-off-by: Ralf Thielow Signed-off-by: Junio C Hamano

t0021: remove debugging cruft

2016-11-11T21:09:24Z

The redirection of the standard error stream to a temporary file is a leftover cruft during debugging. Remove it. Besides, it is reported by folks on the Windows that the test is flaky with this redirection; somebody gets confused and this merely-redirected-to file gets marked as delete-pending by git.exe and makes it finish with a non-zero exit status when "git checkout" finishes. Windows folks may want to figure that one out, but for the purpose of this test, it shouldn't become a show-stopper. Signed-off-by: Junio C Hamano