@@ -97,6 +97,13 @@ Performance, Internal Implementation, Development Support etc.
9797 of "git stripspace" has been updated to use the parse_options API.
9898 (merge bed4452 tk/stripspace later to maint).
9999
100+ * "git am" used to spawn "git mailinfo" via run_command() API once
101+ per each patch, but learned to make a direct call to mailinfo()
102+ instead.
103+
104+ * The implementation of "git mailinfo" was refactored so that a
105+ mailinfo() function can be directly called from inside a process.
106+
100107
101108Also contains various documentation updates and code clean-ups.
102109
@@ -258,7 +265,20 @@ notes for details).
258265 never die, which is not the case (yet).
259266 (merge c63d4b2 jc/am-3-fallback-regression-fix later to maint).
260267
261- * Code clean-up and minor fixes.
268+ * The linkage order of libraries was wrong in places around libcurl.
269+ (merge 7e91e8d rp/link-curl-before-ssl later to maint).
270+
271+ * The name-hash subsystem that is used to cope with case insensitive
272+ filesystems keeps track of directories and their on-filesystem
273+ cases for all the paths in the index by holding a pointer to a
274+ randomly chosen cache entry that is inside the directory (for its
275+ ce->ce_name component). This pointer was not updated even when the
276+ cache entry was removed from the index, leading to use after free.
277+ This was fixed by recording the path for each directory instead of
278+ borrowing cache entries and restructuring the API somewhat.
279+ (merge 41284eb dt/name-hash-dir-entry-fix later to maint).
280+
281+ * Code clean-up, minor fixes etc.
262282 (merge 15ed07d jc/rerere later to maint).
263283 (merge e7a7401 pt/pull-builtin later to maint).
264284 (merge 29bc480 nd/ls-remote-does-not-have-u-option later to maint).
@@ -269,3 +289,6 @@ notes for details).
269289 (merge 44cd91e cc/quote-comments later to maint).
270290 (merge 147875f sb/submodule-config-parse later to maint).
271291 (merge ae9f274 es/worktree-add later to maint).
292+ (merge 3b19dba jc/em-dash-in-doc later to maint).
293+ (merge f3f38c7 jc/everyday-markup later to maint).
294+ (merge 77d5f71 xf/user-manual-markup later to maint).
0 commit comments