From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Feb 2018 22:56:49 +0000 (-0800)
Subject: Third batch for 2.17
X-Git-Tag: v2.17.0-rc0~88
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1f9c1fab6421402a9c893a2fcd35fb4cf6116166

Third batch for 2.17

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/RelNotes/2.17.0.txt b/Documentation/RelNotes/2.17.0.txt
index e1e509b5b0..1fe7b61a67 100644
--- a/Documentation/RelNotes/2.17.0.txt
+++ b/Documentation/RelNotes/2.17.0.txt
@@ -59,6 +59,16 @@ Performance, Internal Implementation, Development Support etc.
    gives performance boost for a few tens of percents in some sample
    scenarios.
 
+ * Push the submodule version of collision-detecting SHA-1 hash
+   implementation a bit harder on builders.
+
+ * Avoid mmapping small files while using packed refs (especially ones
+   with zero size, which would cause later munmap() to fail).
+   (merge ba41a8b600 kg/packed-ref-cache-fix later to maint).
+
+ * Conversion from uchar[20] to struct object_id continues.
+
+ * More tests for wildmatch functions.
 
 Also contains various documentation updates and code clean-ups.
 
@@ -143,6 +153,19 @@ Fixes since v2.16
  * Workaround for segfault with more recent versions of SVN.
    (merge 7f6f75e97a ew/svn-branch-segfault-fix later to maint).
 
+ * Plug recently introduced leaks in fsck.
+   (merge ba3a08ca0e jt/fsck-code-cleanup later to maint).
+
+ * "git pull --rebase" did not pass verbosity setting down when
+   recursing into a submodule.
+   (merge a56771a668 sb/pull-rebase-submodule later to maint).
+
+ * The way "git reset --hard" reports the commit the updated HEAD
+   points at is made consistent with the way how the commit title is
+   generated by the other parts of the system.  This matters when the
+   title is spread across physically multiple lines.
+   (merge 1cf823fb68 tg/reset-hard-show-head-with-pretty later to maint).
+
  * Other minor doc, test and build updates and code cleanups.
    (merge e2a5a028c7 bw/oidmap-autoinit later to maint).
    (merge f0a6068a9f ys/bisect-object-id-missing-conversion-fix later to maint).
@@ -159,3 +182,6 @@ Fixes since v2.16
    (merge 4e801463c7 jc/mailinfo-cleanup-fix later to maint).
    (merge ef5b3a6c5e nd/shared-index-fix later to maint).
    (merge 9f5258cbb8 tz/doc-show-defaults-to-head later to maint).
+   (merge b780e4407d jc/worktree-add-short-help later to maint).
+   (merge ae239fc8e5 rs/cocci-strbuf-addf-to-addstr later to maint).
+   (merge 2e22a85e5c nd/ignore-glob-doc-update later to maint).