git, branch v2.5.1

Git 2.5.1

2015-08-28T18:19:57Z

Signed-off-by: Junio C Hamano

Mingw: verify both ends of the pipe () call

2015-08-28T18:11:50Z

The code to open and test the second end of the pipe clearly imitates the code for the first end. A little too closely, though... Let's fix the obvious copy-edit bug. Signed-off-by: Jose F. Morales Signed-off-by: Johannes Schindelin Reviewed-by: Jonathan Nieder Acked-by: Johannes Sixt Signed-off-by: Junio C Hamano

Merge branch 'jk/guess-repo-name-regression-fix' into maint

2015-08-25T23:09:17Z

"git clone $URL" in recent releases of Git contains a regression in the code that invents a new repository name incorrectly based on the $URL. This has been corrected. * jk/guess-repo-name-regression-fix: clone: use computed length in guess_dir_name clone: add tests for output directory

Merge branch 'jk/test-with-x' into maint

2015-08-25T23:09:16Z

Running tests with the "-x" option to make them verbose had some unpleasant interactions with other features of the test suite. * jk/test-with-x: test-lib: disable trace when test is not verbose test-lib: turn off "-x" tracing during chain-lint check

Merge branch 'sb/check-return-from-read-ref' into maint

2015-08-25T23:09:16Z

* sb/check-return-from-read-ref: transport-helper: die on errors reading refs.

Merge branch 'mm/pull-upload-pack' into maint

2015-08-25T23:09:15Z

"git pull" in recent releases of Git has a regression in the code that allows custom path to the --upload-pack=. This has been corrected. Note that this is irrelevant for 'master' with "git pull" rewritten in C. * mm/pull-upload-pack: pull: pass upload_pack only when it was given pull.sh: quote $upload_pack when passing it to git-fetch

pull: pass upload_pack only when it was given

2015-08-25T23:08:58Z

The upload_pack shell variable is initialized to an empty string, so conditional expansion with ${upload_pack+"$upload_pack"} would not work very well. You need a colon there. Signed-off-by: Junio C Hamano

Start preparing for 2.5.1

2015-08-19T21:48:13Z

Signed-off-by: Junio C Hamano

Merge branch 'ta/docfix-index-format-tech' into maint

2015-08-19T21:41:34Z

* ta/docfix-index-format-tech: typofix for index-format.txt

Merge branch 'sb/parse-options-codeformat' into maint

2015-08-19T21:41:34Z

* sb/parse-options-codeformat: parse-options: align curly braces for all options