From cbfb543e17fd332140001cbd3ce18fb4649ad8f3 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 4 Nov 2019 14:19:21 +0900 Subject: What's cooking (2019/11 #01) diff --git a/whats-cooking.txt b/whats-cooking.txt index 40fa9ca..be89639 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,10 +1,10 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Oct 2019, #07; Wed, 30) -X-master-at: f21f8f5d35b09ecdd1a0112f114436fd2eda7df2 -X-next-at: 50e10028f102536c1a9ac2647d3aae9cc8a7c5d7 +Subject: What's cooking in git.git (Nov 2019, #01; Mon, 4) +X-master-at: da72936f544fec5a335e66432610e4cef4430991 +X-next-at: 9d3f5f5b63cc3ed44eec3428f9e8874fb34f9cc0 -What's cooking in git.git (Oct 2019, #07; Wed, 30) +What's cooking in git.git (Nov 2019, #01; Mon, 4) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with @@ -12,9 +12,13 @@ Here are the topics that have been cooking. Commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. -There is the v2.24.0-rc2 tag now; the contents of the release -candidate hasn't changed much since the -rc1; hopefully we can see -the final thing real soon now. +Git 2.24 has been tagged. Hopefully there needs no immediate brown +paper bag fixes needed for the 'master' branch. The next cycle will +start perhaps early next week by first rewinding the 'next' branch, +after the dust settles. Topics marked as "will cook in next" can be +given a fresh start by ejecting them from 'next' and queueing a new +version (please just ask). Topics currently not in 'next' will then +start getting merged down after all that. You can find the changes described here in the integration branches of the repositories listed at @@ -24,30 +28,116 @@ of the repositories listed at -------------------------------------------------- [Graduated to "master"] -* js/mingw-needs-hiding-fix (2019-10-28) 1 commit - (merged to 'next' on 2019-10-28 at d41210960f) - + mingw: avoid a buffer overrun in `needs_hiding()` +* bc/doc-use-docbook-5 (2019-11-02) 1 commit + (merged to 'next' on 2019-11-02 at 68e379d0b0) + + manpage-bold-literal.xsl: match for namespaced "d:literal" in template - Fix for a (rather old) buffer-overrun bug. + Finishing touches to the recent update to the build procedure for + the documentation. -* rl/gitweb-blame-prev-fix (2019-10-28) 1 commit - (merged to 'next' on 2019-10-28 at 876152daa8) - + gitweb: correctly store previous rev in javascript-actions mode +* ds/commit-graph-on-fetch (2019-10-25) 2 commits + (merged to 'next' on 2019-10-30 at 3ca711f743) + + commit-graph: fix writing first commit-graph during fetch + + t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug - Fix a rather old bug in gitweb---incremental blame output in - javascript actions mode never worked. + Regression fix. -* wb/fsmonitor-bitmap-fix (2019-10-30) 1 commit - (merged to 'next' on 2019-10-30 at f63ada9e8d) - + t7519-status-fsmonitor: improve comments +* jt/delay-fetch-if-missing (2019-10-24) 1 commit + (merged to 'next' on 2019-10-30 at 6c884f3267) + + fetch: delay fetch_if_missing=0 until after config - Comment update. + Work-around a lazy fetch glitch. -------------------------------------------------- [New Topics] +* es/myfirstcontrib-updates (2019-11-02) 3 commits + - myfirstcontrib: hint to find gitgitgadget allower + - myfirstcontrib: add dependency installation step + - myfirstcontrib: add 'psuh' to command-list.txt + + Doc updates. + + Will merge to 'next'. + + +* rt/fetch-message-fix (2019-11-02) 1 commit + - fetch.c: fix typo in a warning message + + A small message update. + + Will merge to 'next'. + +-------------------------------------------------- +[Stalled] + +* vn/reset-deleted-ita (2019-07-26) 1 commit + - reset: unstage empty deleted ita files + + "git reset HEAD []" did not reset an empty file that was + added with the intent-to-add bit. + + Expecting a reroll. + + +* jn/unknown-index-extensions (2018-11-21) 2 commits + - index: offer advice for unknown index extensions + - index: do not warn about unrecognized extensions + + A bit too alarming warning given when unknown index extensions + exist is getting revamped. + + Expecting a reroll. + + +* jc/format-patch-delay-message-id (2019-04-05) 1 commit + - format-patch: move message-id and related headers to the end + + The location "git format-patch --thread" adds the Message-Id: + header in the series of header fields has been moved down, which + may help working around a suspected bug in GMail MSA, reported at + + + Waiting for feedback to see if it truly helps. + Needs tests. + + +* js/protocol-advertise-multi (2018-12-28) 1 commit + - protocol: advertise multiple supported versions + + The transport layer has been updated so that the protocol version + used can be negotiated between the parties, by the initiator + listing the protocol versions it is willing to talk, and the other + side choosing from one of them. + + Expecting a reroll. + cf. + + +* mk/use-size-t-in-zlib (2018-10-15) 1 commit + - zlib.c: use size_t for size + + The wrapper to call into zlib followed our long tradition to use + "unsigned long" for sizes of regions in memory, which have been + updated to use "size_t". + +-------------------------------------------------- +[Cooking] + +* ra/rebase-i-more-options (2019-11-02) 6 commits + - rebase: add --reset-author-date + - rebase -i: support --ignore-date + - sequencer: rename amend_author to author_to_rename + - rebase -i: support --committer-date-is-author-date + - sequencer: allow callers of read_author_script() to ignore fields + - rebase -i: add --ignore-whitespace flag + + "git rebase -i" learned a few options that are known by "git + rebase" proper. + + * en/doc-typofix (2019-10-25) 1 commit (merged to 'next' on 2019-10-30 at 8405cac984) + Documentation: fix a bunch of typos, both old and new @@ -66,8 +156,8 @@ of the repositories listed at Will cook in 'next'. -* js/update-index-ignore-removal-for-skip-worktree (2019-10-29) 2 commits - (merged to 'next' on 2019-10-30 at 5c7c7a6055) +* js/update-index-ignore-removal-for-skip-worktree (2019-11-02) 2 commits + (merged to 'next' on 2019-11-02 at 57f7fb885f) + stash: handle staged changes in skip-worktree files correctly + update-index: optionally leave skip-worktree entries alone @@ -99,7 +189,7 @@ of the repositories listed at Will merge to 'next'. -* dl/doc-diff-no-index-implies-exit-code (2019-10-30) 1 commit +* dl/doc-diff-no-index-implies-exit-code (2019-11-02) 1 commit - git-diff.txt: document return code of `--no-index` Doc update. @@ -113,13 +203,15 @@ of the repositories listed at "git submodule" learned a subcommand "set-url". -* js/vreportf-wo-buffering (2019-10-30) 1 commit +* js/vreportf-wo-buffering (2019-11-02) 1 commit - vreportf(): avoid relying on stdio buffering Messages from die() etc. can be mixed up from multiple processes without even line buffering on Windows, which has been worked around. + Will merge to 'next'. + * ma/bisect-doc-sample-update (2019-10-29) 1 commit - Documentation/git-bisect.txt: add --no-ff to merge command @@ -163,76 +255,6 @@ of the repositories listed at Will merge to 'next'. --------------------------------------------------- -[Stalled] - -* ra/rebase-i-more-options (2019-09-09) 6 commits - - rebase: add --reset-author-date - - rebase -i: support --ignore-date - - sequencer: rename amend_author to author_to_rename - - rebase -i: support --committer-date-is-author-date - - sequencer: allow callers of read_author_script() to ignore fields - - rebase -i: add --ignore-whitespace flag - - "git rebase -i" learned a few options that are known by "git - rebase" proper. - - Needs to consider existing GIT_COMMITTER_DATE environment, etc. - cf. <5adde732-173b-d24d-d23f-bb4d043076d7@gmail.com> - - -* vn/reset-deleted-ita (2019-07-26) 1 commit - - reset: unstage empty deleted ita files - - "git reset HEAD []" did not reset an empty file that was - added with the intent-to-add bit. - - Expecting a reroll. - - -* jn/unknown-index-extensions (2018-11-21) 2 commits - - index: offer advice for unknown index extensions - - index: do not warn about unrecognized extensions - - A bit too alarming warning given when unknown index extensions - exist is getting revamped. - - Expecting a reroll. - - -* jc/format-patch-delay-message-id (2019-04-05) 1 commit - - format-patch: move message-id and related headers to the end - - The location "git format-patch --thread" adds the Message-Id: - header in the series of header fields has been moved down, which - may help working around a suspected bug in GMail MSA, reported at - - - Waiting for feedback to see if it truly helps. - Needs tests. - - -* js/protocol-advertise-multi (2018-12-28) 1 commit - - protocol: advertise multiple supported versions - - The transport layer has been updated so that the protocol version - used can be negotiated between the parties, by the initiator - listing the protocol versions it is willing to talk, and the other - side choosing from one of them. - - Expecting a reroll. - cf. - - -* mk/use-size-t-in-zlib (2018-10-15) 1 commit - - zlib.c: use size_t for size - - The wrapper to call into zlib followed our long tradition to use - "unsigned long" for sizes of regions in memory, which have been - updated to use "size_t". - --------------------------------------------------- -[Cooking] * hv/bitshift-constants-in-blame (2019-10-21) 1 commit (merged to 'next' on 2019-10-24 at bc84aae4d4) @@ -295,16 +317,6 @@ of the repositories listed at Expecting a reroll. -* ds/commit-graph-on-fetch (2019-10-25) 2 commits - (merged to 'next' on 2019-10-30 at 3ca711f743) - + commit-graph: fix writing first commit-graph during fetch - + t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug - - "git commit-grph write" hit BUG() in corner cases. - - Will cook in 'next'. - - * jc/am-show-current-patch-docfix (2019-10-23) 1 commit (merged to 'next' on 2019-10-24 at 31fa6081f2) + doc: am --show-current-patch gives an entire e-mail message @@ -380,15 +392,6 @@ of the repositories listed at Will merge to 'next'. -* jt/delay-fetch-if-missing (2019-10-24) 1 commit - (merged to 'next' on 2019-10-30 at 6c884f3267) - + fetch: delay fetch_if_missing=0 until after config - - Work-around a lazy fetch glitch. - - Will cook in 'next'. - - * dd/notes-copy-default-dst-to-head (2019-10-18) 2 commits (merged to 'next' on 2019-10-18 at 2588a175ec) + notes: fix minimum number of parameters to "copy" subcommand -- cgit v0.10.2-6-g49f6