Sync with maint

1 files changed, 14 insertions, 0 deletions

diff --git a/Documentation/RelNotes/2.6.5.txt b/Documentation/RelNotes/2.6.5.txt
index e1b75fb30e..3e6331d9dc 100644
--- a/Documentation/RelNotes/2.6.5.txt
+++ b/Documentation/RelNotes/2.6.5.txt
@@ -21,5 +21,19 @@ Fixes since v2.6.4
    NULL.  This gives a compiler an excuse to declare that tree will
    never be NULL and apply a wrong optimization.  Avoid it.
 
+ * The helper used to iterate over loose object directories to prune
+   stale objects did not closedir() immediately when it is done with a
+   directory--a callback such as the one used for "git prune" may want
+   to do rmdir(), but it would fail on open directory on platforms
+   such as WinXP.
+
+ * "git p4" used to import Perforce CLs that touch only paths outside
+   the client spec as empty commits.  It has been corrected to ignore
+   them instead, with a new configuration git-p4.keepEmptyCommits as a
+   backward compatibility knob.
+
+ * The exit code of git-fsck did not reflect some types of errors
+   found in packed objects, which has been corrected.
+
 Also contains typofixes, documentation updates and trivial code
 clean-ups.