The eighth batch for 2.15

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

Junio C Hamano committed Sep 19, 2017 at 10:55 UTC 9ddaf86b06a8078420f59aec8cab6daa93cf1a91
1 file changed +58
Documentation/RelNotes/2.15.0.txt
+58
@@ -136,6 +136,38 @@ Performance, Internal Implementation, Development Support etc.
136 piece of memory while writing each index entry out. This has been
137 optimized.
138
139 + * Platforms that ship with a separate sha1 with collision detection
140 + library can link to it instead of using the copy we ship as part of
141 + our source tree.
142 +
143 + * Code around "notes" have been cleaned up.
144 + (merge 3964281524 mh/notes-cleanup later to maint).
145 +
146 + * The long-standing rule that an in-core lockfile instance, once it
147 + is used, must not be freed, has been lifted and the lockfile and
148 + tempfile APIs have been updated to reduce the chance of programming
149 + errors.
150 +
151 + * Our hashmap implementation in hashmap.[ch] is not thread-safe when
152 + adding a new item needs to expand the hashtable by rehashing; add
153 + an API to disable the automatic rehashing to work it around.
154 +
155 + * Many of our programs consider that it is OK to release dynamic
156 + storage that is used throughout the life of the program by simply
157 + exiting, but this makes it harder to leak detection tools to avoid
158 + reporting false positives. Plug many existing leaks and introduce
159 + a mechanism for developers to mark that the region of memory
160 + pointed by a pointer is not lost/leaking to help these tools.
161 +
162 + * As "git commit" to conclude a conflicted "git merge" honors the
163 + commit-msg hook, "git merge" that records a merge commit that
164 + cleanly auto-merges should, but it didn't.
165 +
166 + * The codepath for "git merge-recursive" has been cleaned up.
167 +
168 + * Many leaks of strbuf have been fixed.
169 +
170 +
171 Also contains various documentation updates and code clean-ups.
172
173
@@ -245,9 +277,35 @@ Fixes since v2.14
277 was in use. This has been fixed.
278 (merge 31824d180d nd/worktree-kill-parse-ref later to maint).
279
280 + * "git gc" and friends when multiple worktrees are used off of a
281 + single repository did not consider the index and per-worktree refs
282 + of other worktrees as the root for reachability traversal, making
283 + objects that are in use only in other worktrees to be subject to
284 + garbage collection.
285 +
286 + * A regression to "gitk --bisect" by a recent update has been fixed.
287 + (merge 1d0538e486 mh/packed-ref-store-prep later to maint).
288 +
289 + * "git -c submodule.recurse=yes pull" did not work as if the
290 + "--recurse-submodules" option was given from the command line.
291 + This has been corrected.
292 +
293 + * Unlike "git commit-tree < file", "git commit-tree -F file" did not
294 + pass the contents of the file verbatim and instead completed an
295 + incomplete line at the end, if exists. The latter has been updated
296 + to match the behaviour of the former.
297 + (merge c818e74332 rk/commit-tree-make-F-verbatim later to maint).
298 +
299 * Other minor doc, test and build updates and code cleanups.
300 (merge f094b89a4d ma/parse-maybe-bool later to maint).
301 (merge 39b00fa4d4 jk/drop-sha1-entry-pos later to maint).
302 (merge 6cdf8a7929 ma/ts-cleanups later to maint).
303 (merge 7560f547e6 ma/up-to-date later to maint).
304 (merge 0db3dc75f3 rs/apply-epoch later to maint).
305 + (merge 74f1bd912b dw/diff-highlight-makefile-fix later to maint).
306 + (merge f991761eb8 jk/config-lockfile-leak-fix later to maint).
307 + (merge 150efef1e7 ma/pkt-line-leakfix later to maint).
308 + (merge 5554451de6 mg/timestamp-t-fix later to maint).
309 + (merge 276d0e35c0 ma/split-symref-update-fix later to maint).
310 + (merge 3bc4b8f7c7 bb/doc-eol-dirty later to maint).
311 + (merge c1bb33c99c jk/system-path-cleanup later to maint).