Skip to content

Commit 49e863b

Browse files
committed
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>
1 parent 58e3dd2 commit 49e863b

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed

Documentation/RelNotes/2.6.5.txt

+25
Original file line numberDiff line numberDiff line change
@@ -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
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Documentation/RelNotes/2.6.4.txt
1+
Documentation/RelNotes/2.6.5.txt

0 commit comments

Comments
 (0)