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