Prepare for 2.6.5

This back-merges hopefully the last batch of trivially correct fixes
to the 2.6.x maintenance track from the master branch.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2015-12-11 11:17:47 -08:00
parent 58e3dd21f6
commit 49e863b02a
2 changed files with 26 additions and 1 deletions

View File

@ -0,0 +1,25 @@
Git v2.6.5 Release Notes
========================
Fixes since v2.6.4
------------------
* Because "test_when_finished" in our test framework queues the
clean-up tasks to be done in a shell variable, it should not be
used inside a subshell. Add a mechanism to allow 'bash' to catch
such uses, and fix the ones that were found.
* Update "git subtree" (in contrib/) so that it can take whitespaces
in the pathnames, not only in the in-tree pathname but the name of
the directory that the repository is in.
* Cosmetic improvement to lock-file error messages.
* mark_tree_uninteresting() has code to handle the case where it gets
passed a NULL pointer in its 'tree' parameter, but the function had
'object = &tree->object' assignment before checking if tree is
NULL. This gives a compiler an excuse to declare that tree will
never be NULL and apply a wrong optimization. Avoid it.
Also contains typofixes, documentation updates and trivial code
clean-ups.

View File

@ -1 +1 @@
Documentation/RelNotes/2.6.4.txt
Documentation/RelNotes/2.6.5.txt