From: Junio C Hamano Date: Sat, 20 Nov 2021 07:10:26 GMT Subject: What's cooking in git.git (Nov 2021, #05; Fri, 19) Message-ID: Here are the topics that have been cooking in my tree. Commits prefixed with '+' are in 'next' (being in 'next' is a sign that a topic is stable enough to be used and are candidate to be in a future release). Commits prefixed with '-' are only in 'seen', which means nothing more than that I have found them of interest for some reason (like "it may have hard-to-resolve conflicts with another topic already in flight" or "this may turn out to be useful"). Do not read too much into a topic being in (or not in) 'seen'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. The tip of the 'master' branch is still at v2.34.0. A few topics for regression fixes have been merged to 'next' and will be merged to 'master' shortly. There are many topics listed as "New" that are in 'seen', but I haven't read many of them (and I shouldn't have anyway, before dealing with regression fixes) and haven't gave any summary comments in this report, either, yet. Copies of the source code to Git live in many repositories, and the following is a list of the ones I push into or their mirrors. Some repositories have only a subset of branches. With maint, master, next, seen, todo: git://git.kernel.org/pub/scm/git/git.git/ git://repo.or.cz/alt-git.git/ https://kernel.googlesource.com/pub/scm/git/git/ https://github.com/git/git/ https://gitlab.com/git-vcs/git/ With all the integration branches and topics broken out: https://github.com/gitster/git/ Even though the preformatted documentation in HTML and man format are not sources, they are published in these repositories for convenience (replace "htmldocs" with "manpages" for the manual pages): git://git.kernel.org/pub/scm/git/git-htmldocs.git/ https://github.com/gitster/git-htmldocs.git/ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- [New Topics] * ab/checkout-branch-info-leakfix (2021-11-18) 1 commit - checkout: fix "branch info" memory leaks Leakfix. Will merge to 'next'. * ab/make-dependency (2021-11-18) 24 commits - Makefile: move ".SUFFIXES" rule to shared.mak - Makefile: define $(LIB_H) in terms of $(FIND_SOURCE_FILES) - Makefile: disable GNU make built-in wildcard rules - Makefile: use $(file) I/O instead of "FORCE" when possible - Makefile: correct the dependency graph of hook-list.h - Makefiles: add and use wildcard "mkdir -p" template - Makefile: use $(wspfx) for $(QUIET...) in shared.mak - Makefile: add "$(QUIET)" boilerplate to shared.mak - Makefile: add a "TRACK_template" for GIT-*{FLAGS,DEFINES,...} - Makefile: re-add and use the "shellquote" macros - Makefile: move $(comma), $(empty) and $(space) to shared.mak - Makefiles: add "shared.mak", move ".DELETE_ON_ERROR" to it - Makefile: stop needing @@GIT_VERSION@@ in *.perl scripts - Makefile: create a GIT-PYTHON-DEFINES, like "PERL" - Makefile: correct "GIT-PERL-{DEFINES,HEADER}" dependency graph - Makefile: adjust Perl-related comments & whitespace - Makefile: change "ifndef NO_PERL" to "ifdef NO_PERL" - Makefile: guard Perl-only variable assignments - Makefile: remove "mv $@ $@+" dance redundant to .DELETE_ON_ERROR - Makefile: clean perl/build/ even with NO_PERL=Y - Makefile: use "=" not ":=" for po/* and perl/* - Makefile: don't set up "perl/build" rules under NO_PERL=Y - Makefile: don't invoke msgfmt with --statistics - Merge branch 'ab/sh-retire-helper-functions' into ab/make-dependency (this branch uses ab/sh-retire-helper-functions.) * ah/advice-pull-has-no-preference-between-rebase-and-merge (2021-11-19) 1 commit - pull: don't say that merge is "the default strategy" The advice message given by "git pull" when the user hasn't made a choice between merge and rebase still said that the merge is the default, which no longer is the case. This has been corrected. Will merge to 'next'. * ds/fetch-pull-with-sparse-index (2021-11-18) 3 commits - ls-files: add --sparse option - fetch/pull: use the sparse index - Merge branch 'ld/sparse-diff-blame' into ds/fetch-pull-with-sparse-index (this branch uses ld/sparse-diff-blame and vd/sparse-reset.) * ev/pull-already-up-to-date-is-noop (2021-11-18) 1 commit (merged to 'next' on 2021-11-19 at 2d8f0cd000) + pull: should be noop when already-up-to-date "git pull" with any strategy when the other side is behind us should succeed as it is a no-op, but doesn't. Will merge to 'master'. * fs/ssh-signing-other-keytypes (2021-11-19) 2 commits - ssh signing: make sign/amend test more resilient - ssh signing: support non ssh-* keytypes * fs/test-prereq (2021-11-18) 2 commits - test-lib: introduce required prereq for test runs - test-lib: show missing prereq summary * jk/t5319-midx-corruption-test-deflake (2021-11-18) 1 commit - t5319: corrupt more bytes of the midx checksum Test fix. * js/trace2-avoid-recursive-errors (2021-11-18) 1 commit - trace2: disable tr2_dst before warning on write errors trace2 error code path fix. * pw/xdiff-classify-record-in-histogram (2021-11-18) 3 commits - xdiff: simplify comparison - xdiff: avoid unnecessary memory allocations - diff histogram: intern strings "diff --histogram" optimization. * rs/mergesort (2021-11-18) 1 commit - mergesort: avoid left shift overflow Bitop fix for 32-bit boxes. * xw/am-empty (2021-11-19) 3 commits - SQUASH??? - am: support --empty=