From 49e863b02ae177069ebe6c4bb3d0e14bef7ccf7a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 11 Dec 2015 11:17:47 -0800 Subject: [PATCH] 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 --- Documentation/RelNotes/2.6.5.txt | 25 +++++++++++++++++++++++++ RelNotes | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes/2.6.5.txt diff --git a/Documentation/RelNotes/2.6.5.txt b/Documentation/RelNotes/2.6.5.txt new file mode 100644 index 0000000000..e1b75fb30e --- /dev/null +++ b/Documentation/RelNotes/2.6.5.txt @@ -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. diff --git a/RelNotes b/RelNotes index 1a01ab88d2..4570bdf876 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/2.6.4.txt \ No newline at end of file +Documentation/RelNotes/2.6.5.txt \ No newline at end of file