@@ -182,6 +182,10 @@ UI, Workflows & Features
182182 to the working tree of the submodule but not the commit that is
183183 checked out.
184184
185+ * Allow the http.postbuffer configuration variable to be set to a
186+ size that can be expressed in size_t, which can be larger than
187+ ulong on some platforms.
188+
185189
186190Performance, Internal Implementation, Development Support etc.
187191
@@ -242,8 +246,6 @@ Performance, Internal Implementation, Development Support etc.
242246 older one and the newer one interoperate happily has now become
243247 possible.
244248
245- * "uchar [40]" to "struct object_id" conversion continues.
246-
247249 * "git tag --contains" used to (ab)use the object bits to keep track
248250 of the state of object reachability without clearing them after
249251 use; this has been cleaned up and made to use the newer commit-slab
@@ -278,13 +280,28 @@ Performance, Internal Implementation, Development Support etc.
278280 * Define a new task in .travis.yml that triggers a test session on
279281 Windows run elsewhere.
280282
281- * Conversion from unsigned char [40 ] to struct object_id continues.
283+ * Conversion from uchar[20 ] to struct object_id continues.
282284
283285 * The "submodule" specific field in the ref_store structure is
284286 replaced with a more generic "gitdir" that can later be used also
285287 when dealing with ref_store that represents the set of refs visible
286288 from the other worktrees.
287289
290+ * The string-list API used a custom reallocation strategy that was
291+ very inefficient, instead of using the usual ALLOC_GROW() macro,
292+ which has been fixed.
293+ (merge 950a234cbd jh/string-list-micro-optim later to maint).
294+
295+ * In a 2- and 3-way merge of trees, more than one source trees often
296+ end up sharing an identical subtree; optimize by not reading the
297+ same tree multiple times in such a case.
298+ (merge d12a8cf0af jh/unpack-trees-micro-optim later to maint).
299+
300+ * The index file has a trailing SHA-1 checksum to detect file
301+ corruption, and historically we checked it every time the index
302+ file is used. Omit the validation during normal use, and instead
303+ verify only in "git fsck".
304+
288305Also contains various documentation updates and code clean-ups.
289306
290307
@@ -492,6 +509,32 @@ notes for details).
492509 checked out; it should use "symbolic-ref HEAD".
493510 (merge eff451101d ld/p4-current-branch-fix later to maint).
494511
512+ * "http.proxy" set to an empty string is used to disable the usage of
513+ proxy. We broke this early last year.
514+ (merge ae51d91105 sr/http-proxy-configuration-fix later to maint).
515+
516+ * $GIT_DIR may in some cases be normalized with all symlinks resolved
517+ while "gitdir" path expansion in the pattern does not receive the
518+ same treatment, leading to incorrect mismatch. This has been fixed.
519+
520+ * "git submodule" script does not work well with strange pathnames.
521+ Protect it from a path with slashes in them, at least.
522+
523+ * "git fetch-pack" was not prepared to accept ERR packet that the
524+ upload-pack can send with a human-readable error message. It
525+ showed the packet contents with ERR prefix, so there was no data
526+ loss, but it was redundant to say "ERR" in an error message.
527+ (merge 8e2c7bef03 jt/fetch-pack-error-reporting later to maint).
528+
529+ * "ls-files --recurse-submodules" did not quite work well in a
530+ project with nested submodules.
531+
532+ * gethostname(2) may not NUL terminate the buffer if hostname does
533+ not fit; unfortunately there is no easy way to see if our buffer
534+ was too small, but at least this will make sure we will not end up
535+ using garbage past the end of the buffer.
536+ (merge 5781a9a270 dt/xgethostname-nul-termination later to maint).
537+
495538 * Other minor doc, test and build updates and code cleanups.
496539 (merge df2a6e38b7 jk/pager-in-use later to maint).
497540 (merge 75ec4a6cb0 ab/branch-list-doc later to maint).
@@ -509,3 +552,8 @@ notes for details).
509552 (merge 35ad44cbd8 sb/submodule-rm-absorb later to maint).
510553 (merge 0301f1fd92 va/i18n-perl-scripts later to maint).
511554 (merge 733e064d98 vn/revision-shorthand-for-side-branch-log later to maint).
555+ (merge 85999743e7 tb/doc-eol-normalization later to maint).
556+ (merge 0747fb49fd jk/loose-object-fsck later to maint).
557+ (merge d8f4481c4f jk/quarantine-received-objects later to maint).
558+ (merge 7ba1ceef95 xy/format-patch-base later to maint).
559+ (merge fa1912c89a rs/misc-cppcheck-fixes later to maint).
0 commit comments