diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-12-11 11:19:43 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-12-11 11:19:43 -0800 |
commit | 52b2e6be992c205cb0733e3ebb801082071a1449 (patch) | |
tree | ff17fa20843a6bc36b4cf24b87572f08cc14daec | |
parent | 782ca8c44e176e8a00c2c824a98dbe6274167639 (diff) | |
parent | 49e863b02ae177069ebe6c4bb3d0e14bef7ccf7a (diff) | |
download | git-52b2e6be992c205cb0733e3ebb801082071a1449.tar.gz |
Merge branch 'maint'
* maint:
Prepare for 2.6.5
-rw-r--r-- | Documentation/RelNotes/2.6.5.txt | 25 |
1 files changed, 25 insertions, 0 deletions
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. |