{"thread":{"id":"57025","subject":"What's cooking in git.git (Dec 2021, #01; Fri, 3)","startedAt":"2021-12-04T01:37:32Z","lastAt":"2021-12-09T10:39:36Z","messageCount":15,"participants":["Junio C Hamano","Phillip Wood","Elijah Newren","Ævar Arnfjörð Bjarmason","Derrick Stolee","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"443050","messageId":"xmqqh7bpqhf0.fsf@gitster.g","threadId":"57025","inReplyTo":null,"subject":"What's cooking in git.git (Dec 2021, #01; Fri, 3)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-12-04T01:37:23Z","receivedAt":"2021-12-04T01:37:32Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"This is probably the first issue of the \"What's cooking\" report, in\nwhich all topics have some sort of description.\n\nThat's a small achievement, at least for me.\n\nEven better, each and every topic is annotated with some sort of\nverdict (like \"Will discard\", \"Expecting a reroll\", \"Will merge to\n'next'?\" etc.). There is no topic in the \"Undecided\" category when\nthis report is fed to \"cook -w\" script (found in the 'todo' branch).\n\nA handful of topics are added to 'next', and we have about 40 topics\ncooking there. For them, the future is automated---they spend about\na week in 'next', and if we find issues in them, we incrementally\nimprove them, or get merged to 'master'.\n\nThen we have about a dozen topics that are marked for 'next' (please\nraise your hand if you have objection before a real damage is done),\nand 8 more that may be ready for 'next' (please raise your hand if\nyou want to nudge them in either direction, for or against).\n\n\n\n\n\n\n\nHere are the topics that have been cooking in my tree. Commits\nprefixed with '+' are in 'next' (being in 'next' is a sign that a\ntopic is stable enough to be used and are candidate to be in a\nfuture release). Commits prefixed with '-' are only in 'seen',\nwhich means nothing more than that I have found them of interest for\nsome reason (like \"it may have hard-to-resolve conflicts with\nanother topic already in flight\" or \"this may turn out to be\nuseful\"). Do not read too much into a topic being in (or not in)\n'seen'. The ones marked with '.' do not appear in any of the\nintegration branches, but I am still holding onto them.\n\nA few topics for regression fixes have been merged to 'next' and\nwill be merged to 'master' shortly. There are many topics listed as\n\"New\" that are in 'seen', but I haven't read many of them (and I\nshouldn't have anyway, before dealing with regression fixes) and\nhaven't gave any summary comments in this report, either, yet.\n\nCopies of the source code to Git live in many repositories, and the\nfollowing is a list of the ones I push into or their mirrors. Some\nrepositories have only a subset of branches.\n\nWith maint, master, next, seen, todo:\n\n\tgit://git.kernel.org/pub/scm/git/git.git/\n\tgit://repo.or.cz/alt-git.git/\n\thttps://kernel.googlesource.com/pub/scm/git/git/\n\thttps://github.com/git/git/\n\thttps://gitlab.com/git-vcs/git/\n\nWith all the integration branches and topics broken out:\n\n\thttps://github.com/gitster/git/\n\nEven though the preformatted documentation in HTML and man format\nare not sources, they are published in these repositories for\nconvenience (replace \"htmldocs\" with \"manpages\" for the manual\npages):\n\n\tgit://git.kernel.org/pub/scm/git/git-htmldocs.git/\n\thttps://github.com/gitster/git-htmldocs.git/\n\nRelease tarballs are available at:\n\n\thttps://www.kernel.org/pub/software/scm/git/\n\n--------------------------------------------------\n[New Topics]\n\n* ab/cat-file (2021-11-29) 10 commits\n - cat-file: use GET_OID_ONLY_TO_DIE in --(textconv|filters)\n - object-name.c: don't have GET_OID_ONLY_TO_DIE imply *_QUIETLY\n - cat-file: correct and improve usage information\n - cat-file: fix remaining usage bugs\n - cat-file: make --batch-all-objects a CMDMODE\n - cat-file: move \"usage\" variable to cmd_cat_file()\n - cat-file docs: fix SYNOPSIS and \"-h\" output\n - parse-options API: add a usage_msg_optf()\n - cat-file tests: test messaging on bad objects/paths\n - cat-file tests: test bad usage\n\n Assorted updates to \"git cat-file\", especially \"-h\".\n\n Needs review.\n Even though this is at its third round, there wasn't any meaningful\n reviews other than typofixes in the earliest round, which may or\n may not be still relevant. The last round needs a serious review\n before becoming eligible for 'next'.\n source: \n\n\n* ab/grep-patterntype (2021-11-29) 7 commits\n - grep: simplify config parsing and option parsing\n - grep API: call grep_config() after grep_init()\n - grep.c: don't pass along NULL callback value\n - built-ins: trust the \"prefix\" from run_builtin()\n - grep tests: add missing \"grep.patternType\" config test\n - log tests: check if grep_config() is called by \"log\"-like cmds\n - grep.h: remove unused \"regex_t regexp\" from grep_opt\n\n Some code clean-up in the \"git grep\" machinery.\n\n Need to pick up a reroll.\n cf. \n source: \n\n\n* en/rebase-x-fix (2021-11-29) 1 commit\n (merged to 'next' on 2021-12-03 at a833829733)\n + sequencer: avoid adding exec commands for non-commit creating commands\n\n \"git rebase -x\" added an unnecessary 'exec' instructions before\n 'noop', which has been corrected.\n\n Will merge to 'master'.\n source: \n\n\n* js/use-builtin-add-i (2021-12-01) 2 commits\n - add -i: default to the built-in implementation\n - t2016: require the PERL prereq only when necessary\n\n \"git add -i\" was rewritten in C some time ago and has been in\n testing; the reimplementation is now exposed to general public by\n default.\n\n On hold.\n There are known breakages on macOS.\n cf. \n source: \n\n\n* jt/conditional-config-on-remote-url (2021-11-29) 2 commits\n - config: include file if remote URL matches a glob\n - config: make git_config_include() static\n\n The conditional inclusion mechanism of configuration files using\n \"[includeIf ]\" learns to base its decision on the\n URL of the remote repository the repository interacts with.\n\n Need to pick up a reroll.\n cf. \n source: <3b3af0da983c65ac8282b14141495f6859cd575a.1638217387.git.jonathantanmy@google.com>\n\n\n* tb/cruft-packs (2021-11-29) 17 commits\n - sha1-file.c: don't freshen cruft packs\n - builtin/gc.c: conditionally avoid pruning objects via loose\n - builtin/repack.c: add cruft packs to MIDX during geometric repack\n - builtin/repack.c: use named flags for existing_packs\n - builtin/repack.c: allow configuring cruft pack generation\n - builtin/repack.c: support generating a cruft pack\n - builtin/pack-objects.c: --cruft with expiration\n - reachable: report precise timestamps from objects in cruft packs\n - reachable: add options to add_unseen_recent_objects_to_traversal\n - builtin/pack-objects.c: --cruft without expiration\n - builtin/pack-objects.c: return from create_object_entry()\n - t/helper: add 'pack-mtimes' test-tool\n - pack-mtimes: support writing pack .mtimes files\n - chunk-format.h: extract oid_version()\n - pack-write: pass 'struct packing_data' to 'stage_tmp_packfiles'\n - pack-mtimes: support reading .mtimes files\n - Documentation/technical: add cruft-packs.txt\n\n Instead of leaving unreachable objects in loose form when packing,\n or ejecting them into loose form when repacking, gather them in a\n packfile with an auxiliary file that records the last-use time of\n these objects.\n\n Expecting a reroll.\n source: \n\n\n* cb/save-term-across-editor-invocation (2021-12-01) 3 commits\n - fixup! editor: allow for saving/restoring terminal state\n - editor: allow for saving/restoring terminal state\n - terminal: teach save_term to fail when not foreground\n\n Some editors are reported to leave the terminal in funny state\n after they exit on Windows. Work it around by saving and restoring\n the terminal state when needed.\n\n Expecting a reroll.\n cf. \n source: <20211202035446.1154-1-carenas@gmail.com>\n\n\n* jk/log-decorate-opts-with-implicit-decorate (2021-12-01) 2 commits\n - log: load decorations with --simplify-by-decoration\n - log: handle --decorate-refs with userformat \"%d\"\n\n When \"git log\" implicitly enabled the \"decoration\" processing\n without being explicitly asked with \"--decorate\" option, it failed\n to read and honor the settings given by the \"--decorate-refs\"\n option.\n\n Will merge to 'next'?\n source: \n\n\n* jl/subtree-check-parents-argument-passing-fix (2021-12-01) 1 commit\n - subtree: fix argument handling in check_parents\n\n Fix performance-releated bug in \"git subtree\" (in contrib/).\n\n Expecting a reroll.\n cf. \n source: \n\n--------------------------------------------------\n[Stalled]\n\n* ar/submodule-update (2021-10-13) 9 commits\n . submodule--helper: rename helper functions\n . submodule--helper: remove unused helpers\n . submodule: move core cmd_update() logic to C\n . submodule--helper: run update using child process struct\n . submodule--helper: allow setting superprefix for init_submodule()\n . submodule--helper: refactor get_submodule_displaypath()\n . submodule--helper: rename helpers for update-clone\n . submodule--helper: get remote names from any repository\n . submodule--helper: split up ensure_core_worktree()\n\n Rewrite of \"git submodule update\" in C.\n\n Expecting a reroll?\n cf. \n source: <20211013051805.45662-10-raykar.ath@gmail.com>\n\n\n* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit\n - fetch: fix segfault on --set-upstream while on a detached HEAD\n\n \"git fetch --set-upstream\" while on detached HEAD segfaulted\n instead of noticing that such an operation did not make sense.\n\n Expecting a reroll.\n A low hanging fruit to make this usable is an addition of a few tests;\n any takers?\n cf. \n cf. \n source: <20210706162238.575988-1-clemens@endorphin.org>\n\n\n* ms/customizable-ident-expansion (2021-09-01) 1 commit\n - keyword expansion: make \"$Id$\" string configurable\n\n Instead of \"$Id$\", user-specified string (like $FreeBSD$) can be\n used as an in-blob placeholder for keyword expansion.\n\n Will discard.\n Stalled for too long.\n cf. \n cf. <211101.86fssf3bn3.gmgdl@evledraar.gmail.com>\n source: \n\n\n* pw/fix-some-issues-in-reset-head (2021-10-01) 12 commits\n - rebase -m: don't fork git checkout\n - rebase --apply: set ORIG_HEAD correctly\n - rebase --apply: fix reflog\n - reset_head(): take struct rebase_head_opts\n - rebase: cleanup reset_head() calls\n - reset_head(): make default_reflog_action optional\n - reset_head(): factor out ref updates\n - reset_head(): remove action parameter\n - reset_head(): don't run checkout hook if there is an error\n - reset_head(): fix checkout\n - rebase: factor out checkout for up to date branch\n - Merge branch 'pw/rebase-of-a-tag-fix' into pw/fix-some-issues-in-reset-head\n\n Fix \"some issues\" in a helper function reset_head().\n\n Will discard.\n This needs a lot better explanation, including what the issues are,\n which codepaths the helper is used in and to do what, and tests to\n protect the fixes.\n source: \n\n--------------------------------------------------\n[Cooking]\n\n* ab/ambiguous-object-name (2021-11-26) 6 commits\n - object-name: re-use \"struct strbuf\" in show_ambiguous_object()\n - object-name: iterate ambiguous objects before showing header\n - object-name: show date for ambiguous tag objects\n - object-name: make ambiguous object output translatable\n - object-name: explicitly handle OBJ_BAD in show_ambiguous_object()\n - object-name tests: add tests for ambiguous object blind spots\n\n Error output given in response to an ambiguous object name has been\n improved.\n\n Needs review.\n An earlier iteration that was much smaller had seen some reviews,\n but the latest round enlarged its scope and needs to be reviewed\n afresh.\n source: \n\n\n* cb/add-p-single-key-fix (2021-11-28) 1 commit\n (merged to 'next' on 2021-12-03 at 8d4f16e620)\n + add -p: avoid use of undefined $key when ReadKey -> EOF\n\n The single-key-input mode in \"git add -p\" had some code to handle\n keys that generate a sequence of input via ReadKey(), which did not\n handle end-of-file correctly, which has been fixed.\n\n Will merge to 'master'.\n source: <20211128174903.5623-1-carenas@gmail.com>\n\n\n* cb/mingw-gmtime-r (2021-11-27) 1 commit\n (merged to 'next' on 2021-12-03 at 785278d40e)\n + mingw: avoid fallback for {local,gm}time_r()\n\n Build fix on Windows.\n\n Will merge to 'master'.\n source: \n\n\n* ds/trace2-regions-in-tests (2021-11-29) 2 commits\n - t/t*: remove custom GIT_TRACE2_EVENT_NESTING\n - test-lib.sh: set GIT_TRACE2_EVENT_NESTING\n\n The default setting for trace2 event nesting was too low to cause\n test failures, which is worked around by bumping it up in the test\n framework.\n\n Will merge to 'next'.\n source: \n\n\n* hn/allow-bogus-oid-in-ref-tests (2021-12-02) 8 commits\n - t1430: create valid symrefs using test-helper\n - t1430: remove refs using test-tool\n - refs: introduce REF_SKIP_REFNAME_VERIFICATION flag\n - refs: introduce REF_SKIP_OID_VERIFICATION flag\n - refs: update comment.\n - test-ref-store: plug memory leak in cmd_delete_refs\n - test-ref-store: parse symbolic flag constants\n - test-ref-store: remove force-create argument for create-reflog\n\n The test helper for refs subsystem learned to write bogus and/or\n nonexistent object name to refs to simulate error situations we\n want to test Git in.\n\n Will merge to 'next'.\n source: \n\n\n* hn/t1404-df-limitation-is-ref-files-only (2021-11-29) 1 commit\n - t1404: mark directory/file conflict tests with REFFILES\n\n Test update.\n\n Will merge to 'next'.\n source: \n\n\n* jc/reflog-iterator-callback-doc (2021-11-28) 1 commit\n - refs: document callback for reflog-ent iterators\n\n Document the parameters given to the reflog entry iterator callback\n functions.\n\n Will merge to 'next'?\n source: \n\n\n* po/size-t-for-vs (2021-12-01) 3 commits\n (merged to 'next' on 2021-12-02 at 489c5b0046)\n + object-file.c: LLP64 compatibility, upcast unity for left shift\n + diffcore-delta.c: LLP64 compatibility, upcast unity for left shift\n + repack.c: LLP64 compatibility, upcast unity for left shift\n\n On platforms where ulong is shorter than size_t, code paths that\n shifted 1 or 1U to the left lacked the necessary cast to size_t,\n which have been corrected.\n\n Will merge to 'master'.\n source: <20211201002902.1042-4-philipoakley@iee.email>\n\n\n* yn/complete-date-format-options (2021-11-25) 1 commit\n (merged to 'next' on 2021-12-03 at 4f37a904a1)\n + completion: add human and auto: date format\n\n The completion script (in contrib/) learns that the \"--date\"\n option of commands from the \"git log\" family takes \"human\" and\n \"auto\" as valid values.\n\n Will merge to 'master'.\n source: \n\n\n* jc/grep-patterntype-default-doc (2021-11-29) 1 commit\n - grep: clarify what `grep.patternType=default` means\n\n Doc update.\n\n Will merge to 'next'.\n source: \n\n\n* ab/ci-updates (2021-11-23) 5 commits\n - CI: don't run \"make test\" twice in one job\n - CI: use \"$runs_on_pool\", not \"$jobname\" to select packages & config\n - CI: rename the \"Linux32\" job to lower-case \"linux32\"\n - CI: use shorter names that fit in UX tooltips\n - CI: remove Travis CI support\n\n Drop support for TravisCI and update test workflows at GitHub.\n\n Will merge to 'next'.\n source: \n\n\n* en/keep-cwd (2021-12-01) 11 commits\n - t2501: simplify the tests since we can now assume desired behavior\n - dir: new flag to remove_dir_recurse() to spare the original_cwd\n - dir: avoid incidentally removing the original_cwd in remove_path()\n - stash: do not attempt to remove startup_info->original_cwd\n - rebase: do not attempt to remove startup_info->original_cwd\n - clean: do not attempt to remove startup_info->original_cwd\n - symlinks: do not include startup_info->original_cwd in dir removal\n - unpack-trees: add special cwd handling\n - unpack-trees: refuse to remove startup_info->original_cwd\n - setup: introduce startup_info->original_cwd\n - t2501: add various tests for removing the current working directory\n\n Many git commands that deal with working tree files try to remove a\n directory that becomes empty (i.e. \"git switch\" from a branch that\n has the directory to another branch that does not would attempt\n remove all files in the directory and the directory itself). This\n drops users into an unfamiliar situation if the command was run in\n a subdirectory that becomes subject to removal due to the command.\n The commands have been taught to keep an empty directory if it is\n the directory they were started in to avoid surprising users.\n\n Needs review.\n There are some comments on earlier rounds; the latest one needs a\n serious review or at least Acks from past commentors.\n source: \n\n\n* ab/run-command (2021-11-25) 9 commits\n - run-command API: remove \"env\" member, always use \"env_array\"\n - difftool: use \"env_array\" to simplify memory management\n - run-command API: remove \"argv\" member, always use \"args\"\n - run-command API users: use strvec_push(), not argv construction\n - run-command API users: use strvec_pushl(), not argv construction\n - run-command tests: use strvec_pushv(), not argv assignment\n - run-command API users: use strvec_pushv(), not argv assignment\n - upload-archive: use regular \"struct child_process\" pattern\n - worktree: stop being overly intimate with run_command() internals\n\n API clean-up.\n\n Will merge to 'next'.\n cf. <211130.86k0gpcpy2.gmgdl@evledraar.gmail.com>\n cf. \n source: \n\n\n* hn/create-reflog-simplify (2021-11-22) 1 commit\n (merged to 'next' on 2021-12-02 at 87ff49b776)\n + refs: drop force_create argument of create_reflog API\n\n A small simplification of API.\n\n Will merge to 'master'.\n source: \n\n\n* hn/reflog-tests (2021-12-02) 5 commits\n - refs/debug: trim trailing LF from reflog message\n - test-ref-store: tweaks to for-each-reflog-ent format\n - t1405: check for_each_reflog_ent_reverse() more thoroughly\n - test-ref-store: don't add newline to reflog message\n - show-branch: show reflog message\n\n Prepare tests on ref API to help testing reftable backends.\n\n Will merge to 'next'.\n source: \n\n\n* jt/midx-doc-fix (2021-11-22) 1 commit\n (merged to 'next' on 2021-12-02 at eac9f263ae)\n + Doc: no midx and partial clone relation\n\n Docfix.\n\n Will merge to 'master'.\n source: <20211122184114.3328662-1-jonathantanmy@google.com>\n\n\n* tl/ls-tree-oid-only (2021-11-22) 1 commit\n - ls-tree.c: support `--oid-only` option for \"git-ls-tree\"\n\n \"git ls-tree\" learns \"--oid-only\" option, similar to \"--name-only\".\n\n Expecting a reroll.\n source: <6c15b4c176b7c03072fa59a4efd9f6fea7d62eae.1637567328.git.dyroneteng@gmail.com>\n\n\n* jk/t7006-sigpipe-tests-fix (2021-11-22) 3 commits\n (merged to 'next' on 2021-12-02 at eefd61931f)\n + t7006: simplify exit-code checks for sigpipe tests\n + t7006: clean up SIGPIPE handling in trace2 tests\n + run-command: unify signal and regular logic for wait_or_whine()\n\n The function to cull a child process and determine the exit status\n had two separate code paths for normal callers and callers in a\n signal handler, and the latter did not yield correct value when the\n child has caught a signal. The handling of the exit status has\n been unified for these two code paths. An existing test with\n flakiness has also been corrected.\n\n Will merge to 'master'.\n source: \n\n\n* em/missing-pager (2021-11-24) 1 commit\n (merged to 'next' on 2021-12-03 at 22ad721b52)\n + pager: fix crash when pager program doesn't exist\n\n When a non-existent program is given as the pager, we tried to\n reuse an uninitialized child_process structure and crashed, which\n has been fixed.\n\n Will merge to 'master'.\n source: <20211125000239.2336-1-ematsumiya@suse.de>\n\n\n* ab/checkout-branch-info-leakfix (2021-11-18) 1 commit\n (merged to 'next' on 2021-12-02 at 5922388782)\n + checkout: fix \"branch info\" memory leaks\n\n Leakfix.\n\n Will merge to 'master'.\n source: \n\n\n* ab/make-dependency (2021-11-18) 24 commits\n - Makefile: move \".SUFFIXES\" rule to shared.mak\n - Makefile: define $(LIB_H) in terms of $(FIND_SOURCE_FILES)\n - Makefile: disable GNU make built-in wildcard rules\n - Makefile: use $(file) I/O instead of \"FORCE\" when possible\n - Makefile: correct the dependency graph of hook-list.h\n - Makefiles: add and use wildcard \"mkdir -p\" template\n - Makefile: use $(wspfx) for $(QUIET...) in shared.mak\n - Makefile: add \"$(QUIET)\" boilerplate to shared.mak\n - Makefile: add a \"TRACK_template\" for GIT-*{FLAGS,DEFINES,...}\n - Makefile: re-add and use the \"shellquote\" macros\n - Makefile: move $(comma), $(empty) and $(space) to shared.mak\n - Makefiles: add \"shared.mak\", move \".DELETE_ON_ERROR\" to it\n - Makefile: stop needing @@GIT_VERSION@@ in *.perl scripts\n - Makefile: create a GIT-PYTHON-DEFINES, like \"PERL\"\n - Makefile: correct \"GIT-PERL-{DEFINES,HEADER}\" dependency graph\n - Makefile: adjust Perl-related comments & whitespace\n - Makefile: change \"ifndef NO_PERL\" to \"ifdef NO_PERL\"\n - Makefile: guard Perl-only variable assignments\n - Makefile: remove \"mv $@ $@+\" dance redundant to .DELETE_ON_ERROR\n - Makefile: clean perl/build/ even with NO_PERL=Y\n - Makefile: use \"=\" not \":=\" for po/* and perl/*\n - Makefile: don't set up \"perl/build\" rules under NO_PERL=Y\n - Makefile: don't invoke msgfmt with --statistics\n - Merge branch 'ab/sh-retire-helper-functions' into ab/make-dependency\n\n Dependency clean-up.\n\n Needs review.\n There are some comments on earlier rounds; the latest one needs a\n serious review or at least Acks from past commentors.\n source: \n\n\n* ah/advice-pull-has-no-preference-between-rebase-and-merge (2021-11-19) 1 commit\n (merged to 'next' on 2021-12-02 at 1b49913760)\n + pull: don't say that merge is \"the default strategy\"\n\n The advice message given by \"git pull\" when the user hasn't made a\n choice between merge and rebase still said that the merge is the\n default, which no longer is the case. This has been corrected.\n\n Will merge to 'master'.\n source: <20211118154317.639118-1-alexhenrie24@gmail.com>\n\n\n* ds/fetch-pull-with-sparse-index (2021-11-29) 3 commits\n - ls-files: add --sparse option\n - fetch/pull: use the sparse index\n - Merge branch 'ld/sparse-diff-blame' into ds/fetch-pull-with-sparse-index\n (this branch uses ld/sparse-diff-blame and vd/sparse-reset.)\n\n \"git fetch\" and \"git pull\" are now declared sparse-index clean.\n Also \"git ls-files\" learns the \"--sparse\" option to help debugging.\n\n Expecting a reroll?\n Discussion seems to have stalled, with a few loose ends questions.\n source: \n\n\n* fs/ssh-signing-other-keytypes (2021-11-19) 2 commits\n - ssh signing: make sign/amend test more resilient\n - ssh signing: support non ssh-* keytypes\n\n The cryptographic signing using ssh keys can specify literal keys\n for keytypes whose name do not begin with the \"ssh-\" prefix by\n using the \"key::\" prefix mechanism (e.g. \"key::ecdsa-sha2-nistp256\").\n\n Will merge to 'next'?\n source: <20211119150707.3924636-1-fs@gigacodes.de>\n\n\n* fs/test-prereq (2021-12-01) 3 commits\n - test-lib: make BAIL_OUT() work in tests and prereq\n - test-lib: introduce required prereq for test runs\n - test-lib: show missing prereq summary\n\n The test framework learns to list unsatisfied test prerequisites,\n and optionally error out when prerequisites that are expected to be\n satisfied are not.\n\n Will merge to 'next'.\n source: <20211201085315.576865-1-fs@gigacodes.de>\n\n\n* jk/t5319-midx-corruption-test-deflake (2021-11-18) 1 commit\n (merged to 'next' on 2021-12-02 at 0ac4fd64aa)\n + t5319: corrupt more bytes of the midx checksum\n\n Test fix.\n\n Will merge to 'master'.\n source: \n\n\n* js/trace2-avoid-recursive-errors (2021-11-18) 1 commit\n (merged to 'next' on 2021-12-02 at c5b1e5ddec)\n + trace2: disable tr2_dst before warning on write errors\n\n trace2 error code path fix.\n\n Will merge to 'master'.\n source: <5a9e49e7f1540d762374382e1769edf112cf093f.1637272706.git.steadmon@google.com>\n\n\n* pw/xdiff-classify-record-in-histogram (2021-11-18) 3 commits\n (merged to 'next' on 2021-12-02 at 5ccd12d09b)\n + xdiff: simplify comparison\n + xdiff: avoid unnecessary memory allocations\n + diff histogram: intern strings\n\n \"diff --histogram\" optimization.\n\n Will merge to 'master'.\n source: \n\n\n* rs/mergesort (2021-11-18) 1 commit\n (merged to 'next' on 2021-12-02 at 0490b0ffbd)\n + mergesort: avoid left shift overflow\n\n Bitop fix for platforms whose \"long\" is 32-bit.\n\n Will merge to 'master'.\n source: <5eabbe1c-4c0f-559a-da21-423afec89e7e@web.de>\n\n\n* xw/am-empty (2021-12-01) 3 commits\n - am: support --allow-empty to record specific empty patches\n - am: support --empty=