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>

Junio C Hamano committed Dec 11, 2015 at 11:17 UTC 49e863b02ae177069ebe6c4bb3d0e14bef7ccf7a
2 files changed +26 -1
Documentation/RelNotes/2.6.5.txt new
+25
@@ -0,0 +1,25 @@
1 +Git v2.6.5 Release Notes
2 +========================
3 +
4 +Fixes since v2.6.4
5 +------------------
6 +
7 + * Because "test_when_finished" in our test framework queues the
8 + clean-up tasks to be done in a shell variable, it should not be
9 + used inside a subshell. Add a mechanism to allow 'bash' to catch
10 + such uses, and fix the ones that were found.
11 +
12 + * Update "git subtree" (in contrib/) so that it can take whitespaces
13 + in the pathnames, not only in the in-tree pathname but the name of
14 + the directory that the repository is in.
15 +
16 + * Cosmetic improvement to lock-file error messages.
17 +
18 + * mark_tree_uninteresting() has code to handle the case where it gets
19 + passed a NULL pointer in its 'tree' parameter, but the function had
20 + 'object = &tree->object' assignment before checking if tree is
21 + NULL. This gives a compiler an excuse to declare that tree will
22 + never be NULL and apply a wrong optimization. Avoid it.
23 +
24 +Also contains typofixes, documentation updates and trivial code
25 +clean-ups.
RelNotes
+1 -1
@@ -1 +1 @@
1 -Documentation/RelNotes/2.6.4.txt
\ No newline at end of file
1 +Documentation/RelNotes/2.6.5.txt
\ No newline at end of file