Unfortunately, the number of topics in the "undecided" category is creeping upwards since the previous issues of the report. 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. 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/ -------------------------------------------------- [Graduated to 'master'] * ab/ci-updates (2021-11-23) 5 commits (merged to 'next' on 2021-12-07 at 1d855a6b33) + CI: don't run "make test" twice in one job + CI: use "$runs_on_pool", not "$jobname" to select packages & config + CI: rename the "Linux32" job to lower-case "linux32" + CI: use shorter names that fit in UX tooltips + CI: remove Travis CI support Drop support for TravisCI and update test workflows at GitHub. source: <cover-v4-0.5-00000000000-20211123T134300Z-avarab@xxxxxxxxx> * ab/die-with-bug (2021-12-07) 4 commits (merged to 'next' on 2021-12-08 at 9b7440fafd) + object.c: use BUG(...) no die("BUG: ...") in lookup_object_by_type() + pathspec: use BUG(...) not die("BUG:%s:%d....", <file>, <line>) + strbuf.h: use BUG(...) not die("BUG: ...") + pack-objects: use BUG(...) not die("BUG: ...") Code clean-up. source: <cover-v2-0.4-00000000000-20211207T110440Z-avarab@xxxxxxxxx> * ab/mark-leak-free-tests-even-more (2021-11-01) 15 commits (merged to 'next' on 2021-12-03 at 1d8c342dab) + leak tests: mark some fast-import tests as passing with SANITIZE=leak + leak tests: mark some config tests as passing with SANITIZE=leak + leak tests: mark some status tests as passing with SANITIZE=leak + leak tests: mark some clone tests as passing with SANITIZE=leak + leak tests: mark some add tests as passing with SANITIZE=leak + leak tests: mark some diff tests as passing with SANITIZE=leak + leak tests: mark some apply tests as passing with SANITIZE=leak + leak tests: mark some notes tests as passing with SANITIZE=leak + leak tests: mark some update-index tests as passing with SANITIZE=leak + leak tests: mark some rev-parse tests as passing with SANITIZE=leak + leak tests: mark some rev-list tests as passing with SANITIZE=leak + leak tests: mark some misc tests as passing with SANITIZE=leak + leak tests: mark most gettext tests as passing with SANITIZE=leak + leak tests: mark "sort" test as passing SANITIZE=leak + leak tests: mark a read-tree test as passing SANITIZE=leak More tests are marked as leak-free. source: <cover-00.15-00000000000-20211030T221945Z-avarab@xxxxxxxxx> * ab/parse-options-cleanup (2021-11-10) 1 commit (merged to 'next' on 2021-12-08 at f9a2ceb9f6) + parse-options.c: use "enum parse_opt_result" for parse_nodash_opt() Change the type of an internal function to return an enum (instead of int) and replace -2 that was used to signal an error with -1. source: <patch-v2-1.1-376f76bb44e-20211110T012523Z-avarab@xxxxxxxxx> * ab/run-command (2021-11-25) 9 commits (merged to 'next' on 2021-12-07 at 5c0bedf853) + run-command API: remove "env" member, always use "env_array" + difftool: use "env_array" to simplify memory management + run-command API: remove "argv" member, always use "args" + run-command API users: use strvec_push(), not argv construction + run-command API users: use strvec_pushl(), not argv construction + run-command tests: use strvec_pushv(), not argv assignment + run-command API users: use strvec_pushv(), not argv assignment + upload-archive: use regular "struct child_process" pattern + worktree: stop being overly intimate with run_command() internals API clean-up. cf. <211130.86k0gpcpy2.gmgdl@xxxxxxxxxxxxxxxxxxx> cf. <CAPig+cSvFgJTiq8pXrWy_7ukQwE1y9ZGwMgKmyjWuQHdNGxiDQ@xxxxxxxxxxxxxx> source: <cover-v3-0.9-00000000000-20211125T224833Z-avarab@xxxxxxxxx> * ds/sparse-deep-pattern-checkout-fix (2021-12-06) 2 commits (merged to 'next' on 2021-12-07 at 7b7f74216a) + unpack-trees: use traverse_path instead of name + t1092: add deeper changes during a checkout The sparse-index/sparse-checkout feature had a bug in its use of the matching code to determine which path is in or outside the sparse checkout patterns. source: <pull.1092.v2.git.1638799837.gitgitgadget@xxxxxxxxx> * ds/trace2-regions-in-tests (2021-11-29) 2 commits (merged to 'next' on 2021-12-07 at ebf31cbaad) + t/t*: remove custom GIT_TRACE2_EVENT_NESTING + test-lib.sh: set GIT_TRACE2_EVENT_NESTING The default setting for trace2 event nesting was too low to cause test failures, which is worked around by bumping it up in the test framework. source: <pull.1085.git.1638193666.gitgitgadget@xxxxxxxxx> * en/zdiff3 (2021-12-01) 2 commits (merged to 'next' on 2021-12-07 at baa3b24593) + update documentation for new zdiff3 conflictStyle + xdiff: implement a zealous diff3, or "zdiff3" "Zealous diff3" style of merge conflict presentation has been added. source: <pull.1036.v5.git.git.1638317108.gitgitgadget@xxxxxxxxx> * es/doc-stdout-vs-stderr (2021-12-04) 1 commit (merged to 'next' on 2021-12-07 at d6487c1256) + CodingGuidelines: document which output goes to stdout vs. stderr Coding guideline document has been updated to clarify what goes to standard error in our system. source: <20211202223110.22062-1-sunshine@xxxxxxxxxxxxxx> * es/pretty-describe-more (2021-11-01) 3 commits (merged to 'next' on 2021-12-07 at e7862a34c8) + pretty: add abbrev option to %(describe) + pretty: add tag option to %(describe) + pretty.c: rework describe options parsing for better extensibility Extend "git log --format=%(describe)" placeholder to allow passing selected command-line options to the underlying "git describe" command. source: <20211031171510.1646396-1-eschwartz@xxxxxxxxxxxxx> * es/worktree-chatty-to-stderr (2021-12-04) 2 commits (merged to 'next' on 2021-12-07 at 84ba7de37c) + git-worktree.txt: add missing `-v` to synopsis for `worktree list` + worktree: send "chatty" messages to stderr "git worktree add" showed "Preparing worktree" message to the standard output stream, but when it failed, the message from die() went to the standard error stream. Depending on the order the stdio streams are flushed at the program end, this resulted in confusing output. It has been corrected by sending all the chatty messages to the standard error stream. source: <20211203034420.47447-1-sunshine@xxxxxxxxxxxxxx> * ew/cbtree-remove-unused-and-broken-cb-unlink (2021-12-07) 1 commit (merged to 'next' on 2021-12-07 at e37b4e16d0) + cbtree: remove broken and unused cb_unlink Code clean-up. source: <20211207183810.688481-1-e@xxxxxxxxx> * ew/test-wo-fsync (2021-10-29) 1 commit (merged to 'next' on 2021-12-08 at 4b90e4870a) + tests: disable fsync everywhere Allow running our tests while disabling fsync. Received a lukewarm reactions overall. Perhaps we should drop instead? source: <20211029001552.GA29647@dcvr> * fs/test-prereq (2021-12-01) 3 commits (merged to 'next' on 2021-12-07 at fc8a8e0006) + test-lib: make BAIL_OUT() work in tests and prereq + test-lib: introduce required prereq for test runs + test-lib: show missing prereq summary The test framework learns to list unsatisfied test prerequisites, and optionally error out when prerequisites that are expected to be satisfied are not. source: <20211201085315.576865-1-fs@xxxxxxxxxxxx> * hn/allow-bogus-oid-in-ref-tests (2021-12-07) 8 commits (merged to 'next' on 2021-12-08 at 8fb70ef68b) + t1430: create valid symrefs using test-helper + t1430: remove refs using test-tool + refs: introduce REF_SKIP_REFNAME_VERIFICATION flag + refs: introduce REF_SKIP_OID_VERIFICATION flag + refs: update comment. + test-ref-store: plug memory leak in cmd_delete_refs + test-ref-store: parse symbolic flag constants + test-ref-store: remove force-create argument for create-reflog The test helper for refs subsystem learned to write bogus and/or nonexistent object name to refs to simulate error situations we want to test Git in. source: <pull.1147.v4.git.git.1638884300.gitgitgadget@xxxxxxxxx> * hn/reflog-tests (2021-12-02) 5 commits (merged to 'next' on 2021-12-07 at 84d4e4b211) + refs/debug: trim trailing LF from reflog message + test-ref-store: tweaks to for-each-reflog-ent format + t1405: check for_each_reflog_ent_reverse() more thoroughly + test-ref-store: don't add newline to reflog message + show-branch: show reflog message Prepare tests on ref API to help testing reftable backends. source: <pull.1145.v3.git.git.1638466593.gitgitgadget@xxxxxxxxx> * hn/reftable (2021-10-08) 19 commits (merged to 'next' on 2021-12-03 at 767ec5d9b3) + Add "test-tool dump-reftable" command. + reftable: add dump utility + reftable: implement stack, a mutable database of reftable files. + reftable: implement refname validation + reftable: add merged table view + reftable: add a heap-based priority queue for reftable records + reftable: reftable file level tests + reftable: read reftable files + reftable: generic interface to tables + reftable: write reftable files + reftable: a generic binary tree implementation + reftable: reading/writing blocks + Provide zlib's uncompress2 from compat/zlib-compat.c + reftable: (de)serialization for the polymorphic record type. + reftable: add blocksource, an abstraction for random access reads + reftable: utility functions + reftable: add error related functionality + reftable: add LICENSE + hash.h: provide constants for the hash IDs (this branch is used by hn/reftable-coverity-fixes.) The "reftable" backend for the refs API, without integrating into the refs subsystem, has been added. source: <pull.1081.v4.git.git.1633638315.gitgitgadget@xxxxxxxxx> * hn/t1404-df-limitation-is-ref-files-only (2021-11-29) 1 commit (merged to 'next' on 2021-12-07 at 074438a4ba) + t1404: mark directory/file conflict tests with REFFILES Test update. source: <pull.1148.v2.git.git.1638210022966.gitgitgadget@xxxxxxxxx> * jc/reflog-iterator-callback-doc (2021-11-28) 1 commit (merged to 'next' on 2021-12-08 at ba5693952d) + refs: document callback for reflog-ent iterators Document the parameters given to the reflog entry iterator callback functions. source: <xmqqk0gs5bgw.fsf@gitster.g> * js/test-initial-branch-override-cleanup (2021-12-05) 1 commit (merged to 'next' on 2021-12-07 at 0ab3e72b4f) + tests: set GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME only when needed Many tests that used to need GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME mechanism to force "git" to use 'master' as the default name for the initial branch no longer need it; the use of the mechanism from them have been removed. source: <pull.1089.git.1638524353230.gitgitgadget@xxxxxxxxx> * re/color-default-reset (2021-10-28) 3 commits (merged to 'next' on 2021-12-08 at ab3ff50ce2) + color: allow colors to be prefixed with "reset" + color: support "default" to restore fg/bg color + color: add missing GIT_COLOR_* white/black constants "default" and "reset" colors have been added to our palette. Seems to have stalled, but I am OK to merge it as-is. cf. <881B4747-B0B5-459B-B673-06972275A8B8@xxxxxxxxx> source: <pull.1117.git.git.1635210227532.gitgitgadget@xxxxxxxxx> source: <pull.1116.git.git.1635201156.gitgitgadget@xxxxxxxxx> * rj/receive-pack-avoid-sigpipe-during-status-reporting (2021-11-10) 1 commit (merged to 'next' on 2021-12-07 at 91039a781e) + receive-pack: ignore SIGPIPE while reporting status to client When the "git push" command is killed while the receiving end is trying to report what happened to the ref update proposals, the latter used to die, due to SIGPIPE. The code now ignores SIGPIPE to increase our chances to run the post-receive hook after it happens. source: <20211110092942.1648429-1-robin@xxxxxxxx> * tb/pack-revindex-on-disk-cleanup (2021-12-04) 1 commit (merged to 'next' on 2021-12-07 at 912c270b70) + packfile: make `close_pack_revindex()` static Code clean-up. source: <dad2b73c84f1c1575a6bce04a449ee1236680b10.1638658219.git.me@xxxxxxxxxxxx> -------------------------------------------------- [New Topics] * es/chainlint (2021-12-13) 15 commits (merged to 'next' on 2021-12-15 at 49b7a37334) + chainlint.sed: stop splitting "(..." into separate lines "(" and "..." + chainlint.sed: swallow comments consistently + chainlint.sed: stop throwing away here-doc tags + chainlint.sed: don't mistake `<< word` in string as here-doc operator + chainlint.sed: make here-doc "<<-" operator recognition more POSIX-like + chainlint.sed: drop subshell-closing ">" annotation + chainlint.sed: drop unnecessary distinction between ?!AMP?! and ?!SEMI?! + chainlint.sed: tolerate harmless ";" at end of last line in block + chainlint.sed: improve ?!SEMI?! placement accuracy + chainlint.sed: improve ?!AMP?! placement accuracy + t/Makefile: optimize chainlint self-test + t/chainlint/one-liner: avoid overly intimate chainlint.sed knowledge + t/chainlint/*.test: generalize self-test commentary + t/chainlint/*.test: fix invalid test cases due to mixing quote types + t/chainlint/*.test: don't use invalid shell syntax The chainlint test script linter in the test suite has been updated. Will merge to 'master'. source: <20211213063059.19424-1-sunshine@xxxxxxxxxxxxxx> * jh/p4-rcs-expansion-in-bytestring (2021-12-13) 4 commits - git-p4: resolve RCS keywords in binary - git-p4: add raw option to read_pipelines - git-p4: pre-compile RCS keyword regexes - git-p4: use with statements to close files after use in patchRCSKeywords The RCS keyword substitution in "git p4" used to be done assuming that the contents are UTF-8 text, which can trigger decoding errors. We now treat the contents as a bytestring for robustness and correctness. Will merge to 'next'? source: <20211213225441.1865782-1-jholdsworth@xxxxxxxxxx> * jz/apply-quiet-and-allow-empty (2021-12-13) 2 commits (merged to 'next' on 2021-12-15 at e3f643eaa3) + git-apply: add --allow-empty flag + git-apply: add --quiet flag "git apply" has been taught to ignore a message without a patch with the "--allow-empty" option. It also learned to honor the "--quiet" option given from the command line. Will merge to 'master'. source: <20211213220327.16042-2-jerry@xxxxxxxxxx> * ds/sparse-checkout-malformed-pattern-fix (2021-12-15) 3 commits - sparse-checkout: refuse to add to bad patterns - sparse-checkout: fix OOM error with mixed patterns - sparse-checkout: fix segfault on malformed patterns source: <pull.1069.v3.git.1639575968.gitgitgadget@xxxxxxxxx> * gc/branch-recurse-submodules (2021-12-15) 6 commits - branch.c: replace questionable exit() codes - branch: add --recurse-submodules option for branch creation - builtin/branch: clean up action-picking logic in cmd_branch() - branch: remove forward declaration of validate_branch_start() - branch: move --set-upstream-to behavior to setup_tracking() - Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodules (this branch uses js/branch-track-inherit.) source: <20211209184928.71413-1-chooglen@xxxxxxxxxx> * jk/ssh-signing-doc-markup-fix (2021-12-15) 1 commit - doc/config: mark ssh allowedSigners example as literal source: <YboWlOG3vZD/7Osx@xxxxxxxxxxxxxxxxxxxxxxx> * jv/use-larger-buffer-in-upload-pack (2021-12-15) 1 commit - upload-pack.c: increase output buffer size source: <20211214194626.33814-1-jacob@xxxxxxxxxx> -------------------------------------------------- [Stalled] * cb/save-term-across-editor-invocation (2021-12-01) 3 commits - fixup! editor: allow for saving/restoring terminal state - editor: allow for saving/restoring terminal state - terminal: teach save_term to fail when not foreground Some editors are reported to leave the terminal in funny state after they exit on Windows. Work it around by saving and restoring the terminal state when needed. Expecting a reroll. cf. <CAPUEsphktbdxeV7hvF52Or3CVHS8oOk5-WV=xfEZa8kfCVVnVg@xxxxxxxxxxxxxx> source: <20211202035446.1154-1-carenas@xxxxxxxxx> * ar/submodule-update (2021-10-13) 9 commits . submodule--helper: rename helper functions . submodule--helper: remove unused helpers . submodule: move core cmd_update() logic to C . submodule--helper: run update using child process struct . submodule--helper: allow setting superprefix for init_submodule() . submodule--helper: refactor get_submodule_displaypath() . submodule--helper: rename helpers for update-clone . submodule--helper: get remote names from any repository . submodule--helper: split up ensure_core_worktree() Rewrite of "git submodule update" in C. Expecting a reroll? cf. <YWiXL+plA7GHfuVv@xxxxxxxxxx> source: <20211013051805.45662-10-raykar.ath@xxxxxxxxx> -------------------------------------------------- [Cooking] * en/sparse-checkout-set (2021-12-15) 10 commits - clone: avoid using deprecated `sparse-checkout init` - Documentation: clarify/correct a few sparsity related statements - git-sparse-checkout.txt: update to document init/set/reapply changes - sparse-checkout: enable reapply to take --[no-]{cone,sparse-index} - sparse-checkout: enable `set` to initialize sparse-checkout mode - sparse-checkout: split out code for tweaking settings config - sparse-checkout: disallow --no-stdin as an argument to set - sparse-checkout: add sanity-checks on initial sparsity state - sparse-checkout: break apart functions for sparse_checkout_(set|add) - sparse-checkout: pass use_stdin as a parameter instead of as a global The "init" and "set" subcommands in "git sparse-checkout" have been unified for a better user experience and performance. Will merge to 'next'. source: <pull.1151.v4.git.git.1639454952.gitgitgadget@xxxxxxxxx> * hn/reftable-coverity-fixes (2021-12-15) 13 commits - reftable: make reftable_record a tagged union - reftable: handle null refnames in reftable_ref_record_equal - reftable: drop stray printf in readwrite_test - reftable: order unittests by complexity - reftable: all xxx_free() functions accept NULL arguments - reftable: fix resource warning - reftable: ignore remove() return value in stack_test.c - reftable: check reftable_stack_auto_compact() return value - reftable: fix resource leak blocksource.c - reftable: fix resource leak in block.c error path - reftable: fix OOB stack write in print functions - Merge branch 'hn/create-reflog-simplify' into hn/reftable-coverity-fixes - Merge branch 'hn/reftable' into hn/reftable-coverity-fixes Problems identified by Coverity in the reftable code have been corrected. Will merge to 'next'? source: <pull.1152.v4.git.git.1639482476.gitgitgadget@xxxxxxxxx> * jk/limit-developers-to-gnu99 (2021-12-08) 2 commits (merged to 'next' on 2021-12-15 at 6b40e01445) + config.mak.dev: specify -std=gnu99 for gcc/clang + Merge branch 'bc/require-c99' into jk/limit-developers-to-gnu99 Enable -std=gnu99 option in DEVELOPER builds. Will merge to 'master'. source: <YbEMnksMEuAz3Nt0@xxxxxxxxxxxxxxxxxxxxxxx> * tb/midx-bitmap-corruption-fix (2021-12-15) 9 commits - fixup! midx: read `RIDX` chunk when present - midx: read `RIDX` chunk when present - t/lib-bitmap.sh: parameterize tests over reverse index source - t5326: move tests to t/lib-bitmap.sh - t5326: extract `test_rev_exists` - t5326: drop unnecessary setup - pack-revindex.c: instrument loading on-disk reverse index - midx.c: make changing the preferred pack safe - t5326: demonstrate bitmap corruption after permutation A bug that made multi-pack bitmap and the object order out-of-sync (hence the .midx data gets corrupted) has been fixed. source: <cover.1639446906.git.me@xxxxxxxxxxxx> * es/test-chain-lint (2021-12-13) 19 commits - t6000-t9999: detect and signal failure within loop - t5000-t5999: detect and signal failure within loop - t4000-t4999: detect and signal failure within loop - t0000-t3999: detect and signal failure within loop - tests: simplify by dropping unnecessary `for` loops - tests: apply modern idiom for exiting loop upon failure - tests: apply modern idiom for signaling test failure - tests: fix broken &&-chains in `{...}` groups - tests: fix broken &&-chains in `$(...)` command substitutions - tests: fix broken &&-chains in compound statements - tests: use test_write_lines() to generate line-oriented output - tests: simplify construction of large blocks of text - t9107: use shell parameter expansion to avoid breaking &&-chain - t6300: make `%(raw:size) --shell` test more robust - t5516: drop unnecessary subshell and command invocation - t4202: clarify intent by creating expected content less cleverly - t1020: avoid aborting entire test script when one test fails - t1010: fix unnoticed failure on Windows - t/lib-pager: use sane_unset() to avoid breaking &&-chain Broken &&-chains in the test scripts have been corrected. Will merge to 'next'. source: <20211209051115.52629-1-sunshine@xxxxxxxxxxxxxx> * jc/flex-array-definition (2021-12-08) 1 commit - flex-array: simplify compiler-specific workaround The conditions to choose different definitions of the FLEX_ARRAY macro for vendor compilers has been simplified to make it easier to maintain. Will merge to 'next'? source: <pull.1094.git.1638823724410.gitgitgadget@xxxxxxxxx> * pw/fix-some-issues-in-reset-head (2021-12-08) 14 commits - rebase -m: don't fork git checkout - rebase --apply: set ORIG_HEAD correctly - rebase --apply: fix reflog - reset_head(): take struct rebase_head_opts - rebase: cleanup reset_head() calls - reset_head(): make default_reflog_action optional - reset_head(): factor out ref updates - create_autostash(): remove unneeded parameter - reset_head(): remove action parameter - rebase --apply: don't run post-checkout hook if there is an error - rebase: do not remove untracked files on checkout - rebase: pass correct arguments to post-checkout hook - t5403: refactor rebase post-checkout hook tests - rebase: factor out checkout for up to date branch Fix "some issues" in a helper function reset_head(). source: <pull.1049.v2.git.1638975481.gitgitgadget@xxxxxxxxx> * je/http-better-error-output (2021-12-03) 1 commit . http-backend: give a hint that web browser access is not supported When the http-backend program, which is the server-side component for the smart HTTP transport, sends a "404 Not found" error, we deliberately did not say anything to the requesting client. We now send a message back to the browser to tell the user that they do not want to visit the URL via their browser, instead of a totally blank page. Expecting a reroll. Breaks its self tests. cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@xxxxxxx> source: <20211202102855.23907-1-jengelh@xxxxxxx> * en/name-rev-shorter-output (2021-12-04) 1 commit (merged to 'next' on 2021-12-10 at ae8ec3912f) + name-rev: prefer shorter names over following merges "git name-rev" has been tweaked to give output that is shorter and easier to understand. Will merge to 'master'. source: <pull.1119.git.git.1636762454792.gitgitgadget@xxxxxxxxx> * en/rebase-x-wo-git-dir-env (2021-12-04) 1 commit (merged to 'next' on 2021-12-07 at 44f2663314) + sequencer: do not export GIT_DIR and GIT_WORK_TREE for 'exec' "git rebase -x" by mistake started exporting the GIT_DIR and GIT_WORK_TREE environment variables when the command was rewritten in C, which has been corrected. Will merge to 'master'. source: <pull.1134.v3.git.git.1638596219656.gitgitgadget@xxxxxxxxx> * ja/i18n-similar-messages (2021-12-05) 10 commits - i18n: ref-filter: factorize "%(foo) atom used without %(bar) atom" - i18n: factorize "--foo outside a repository" - i18n: refactor "unrecognized %(foo) argument" strings - i18n: factorize "no directory given for --foo" - i18n: factorize "--foo requires --bar" and the like - i18n: tag.c factorize i18n strings - i18n: standardize "cannot open" and "cannot read" - i18n: turn "options are incompatible" into "are mutually exclusive" - i18n: refactor "%s, %s and %s are mutually exclusive" - i18n: refactor "foo and bar are mutually exclusive" Similar message templates have been consolidated so that translators need to work on fewer number of messages. Needs review. source: <pull.1088.git.1638514909.gitgitgadget@xxxxxxxxx> * ab/usage-die-message (2021-12-07) 6 commits - config API: use get_error_routine(), not vreportf() - usage.c + gc: add and use a die_message_errno() - gc: return from cmd_gc(), don't call exit() - usage.c API users: use die_message() for error() + exit 128 - usage.c API users: use die_message() for "fatal :" + exit 128 - usage.c: add a die_message() routine Code clean-up to hide vreportf() from public API. Needs review. source: <cover-v2-0.6-00000000000-20211207T182419Z-avarab@xxxxxxxxx> * ab/common-main-cleanup (2021-12-07) 1 commit (merged to 'next' on 2021-12-15 at ff08c86f65) + common-main.c: call exit(), don't return Code clean-up. Will merge to 'master'. source: <patch-v2-1.1-4f52ecc94ba-20211207T101207Z-avarab@xxxxxxxxx> * ab/fetch-set-upstream-while-detached (2021-12-07) 1 commit (merged to 'next' on 2021-12-15 at d0406f880a) + pull, fetch: fix segfault in --set-upstream option "git fetch --set-upstream" did not check if there is a current branch, leading to a segfault when it is run on a detached HEAD, which has been corrected. Will merge to 'master'. source: <patch-v5-1.1-69ab40d623b-20211207T215115Z-avarab@xxxxxxxxx> * ab/cat-file (2021-12-08) 10 commits - cat-file: use GET_OID_ONLY_TO_DIE in --(textconv|filters) - object-name.c: don't have GET_OID_ONLY_TO_DIE imply *_QUIETLY - cat-file: correct and improve usage information - cat-file: fix remaining usage bugs - cat-file: make --batch-all-objects a CMDMODE - cat-file: move "usage" variable to cmd_cat_file() - cat-file docs: fix SYNOPSIS and "-h" output - parse-options API: add a usage_msg_optf() - cat-file tests: test messaging on bad objects/paths - cat-file tests: test bad usage Assorted updates to "git cat-file", especially "-h". source: <cover-v4-00.10-00000000000-20211208T123151Z-avarab@xxxxxxxxx> * ab/grep-patterntype (2021-12-04) 7 commits - grep: simplify config parsing and option parsing - grep API: call grep_config() after grep_init() - grep.c: don't pass along NULL callback value - built-ins: trust the "prefix" from run_builtin() - grep tests: add missing "grep.patternType" config test - log tests: check if grep_config() is called by "log"-like cmds - grep.h: remove unused "regex_t regexp" from grep_opt Some code clean-up in the "git grep" machinery. Needs review. source: <cover-v4-0.7-00000000000-20211203T101348Z-avarab@xxxxxxxxx> * js/use-builtin-add-i (2021-12-01) 2 commits - add -i: default to the built-in implementation - t2016: require the PERL prereq only when necessary "git add -i" was rewritten in C some time ago and has been in testing; the reimplementation is now exposed to general public by default. On hold. There are known breakages on macOS. cf. <nycvar.QRO.7.76.6.2112021832060.63@xxxxxxxxxxxxxxxxx> source: <pull.1087.git.1638281655.gitgitgadget@xxxxxxxxx> * jt/conditional-config-on-remote-url (2021-12-15) 2 commits - config: include file if remote URL matches a glob - config: make git_config_include() static The conditional inclusion mechanism of configuration files using "[includeIf <condition>]" learns to base its decision on the URL of the remote repository the repository interacts with. source: <cover.1639509048.git.jonathantanmy@xxxxxxxxxx> * tb/cruft-packs (2021-11-29) 17 commits - sha1-file.c: don't freshen cruft packs - builtin/gc.c: conditionally avoid pruning objects via loose - builtin/repack.c: add cruft packs to MIDX during geometric repack - builtin/repack.c: use named flags for existing_packs - builtin/repack.c: allow configuring cruft pack generation - builtin/repack.c: support generating a cruft pack - builtin/pack-objects.c: --cruft with expiration - reachable: report precise timestamps from objects in cruft packs - reachable: add options to add_unseen_recent_objects_to_traversal - builtin/pack-objects.c: --cruft without expiration - builtin/pack-objects.c: return from create_object_entry() - t/helper: add 'pack-mtimes' test-tool - pack-mtimes: support writing pack .mtimes files - chunk-format.h: extract oid_version() - pack-write: pass 'struct packing_data' to 'stage_tmp_packfiles' - pack-mtimes: support reading .mtimes files - Documentation/technical: add cruft-packs.txt Instead of leaving unreachable objects in loose form when packing, or ejecting them into loose form when repacking, gather them in a packfile with an auxiliary file that records the last-use time of these objects. Expecting a reroll. source: <cover.1638224692.git.me@xxxxxxxxxxxx> * jk/log-decorate-opts-with-implicit-decorate (2021-12-01) 2 commits (merged to 'next' on 2021-12-10 at 80585b2755) + log: load decorations with --simplify-by-decoration + log: handle --decorate-refs with userformat "%d" When "git log" implicitly enabled the "decoration" processing without being explicitly asked with "--decorate" option, it failed to read and honor the settings given by the "--decorate-refs" option. Will merge to 'master'. source: <YahbseXEC66dK0k8@xxxxxxxxxxxxxxxxxxxxxxx> * jl/subtree-check-parents-argument-passing-fix (2021-12-05) 1 commit - subtree: fix argument handling in check_parents Fix performance-releated bug in "git subtree" (in contrib/). Expecting a reroll. cf. <nycvar.QRO.7.76.6.2112072243310.90@xxxxxxxxxxxxxxxxx> source: <pull.1086.v3.git.1638758742741.gitgitgadget@xxxxxxxxx> * ab/ambiguous-object-name (2021-11-26) 6 commits - object-name: re-use "struct strbuf" in show_ambiguous_object() - object-name: iterate ambiguous objects before showing header - object-name: show date for ambiguous tag objects - object-name: make ambiguous object output translatable - object-name: explicitly handle OBJ_BAD in show_ambiguous_object() - object-name tests: add tests for ambiguous object blind spots Error output given in response to an ambiguous object name has been improved. Needs review. An earlier iteration that was much smaller had seen some reviews, but the latest round enlarged its scope and needs to be reviewed afresh. source: <patch-v5-6.6-78bb0995f08-20211125T215529Z-avarab@xxxxxxxxx> * jc/grep-patterntype-default-doc (2021-12-05) 1 commit (merged to 'next' on 2021-12-10 at e46385ad9d) + grep: clarify what `grep.patternType=default` means Doc update. Will merge to 'master'. source: <xmqqy24ykdel.fsf_-_@gitster.g> * en/keep-cwd (2021-12-09) 11 commits - t2501: simplify the tests since we can now assume desired behavior - dir: new flag to remove_dir_recurse() to spare the original_cwd - dir: avoid incidentally removing the original_cwd in remove_path() - stash: do not attempt to remove startup_info->original_cwd - rebase: do not attempt to remove startup_info->original_cwd - clean: do not attempt to remove startup_info->original_cwd - symlinks: do not include startup_info->original_cwd in dir removal - unpack-trees: add special cwd handling - unpack-trees: refuse to remove startup_info->original_cwd - setup: introduce startup_info->original_cwd - t2501: add various tests for removing the current working directory Many git commands that deal with working tree files try to remove a directory that becomes empty (i.e. "git switch" from a branch that has the directory to another branch that does not would attempt remove all files in the directory and the directory itself). This drops users into an unfamiliar situation if the command was run in a subdirectory that becomes subject to removal due to the command. The commands have been taught to keep an empty directory if it is the directory they were started in to avoid surprising users. Will merge to 'next'? source: <pull.1140.v6.git.git.1639026515.gitgitgadget@xxxxxxxxx> * tl/ls-tree-oid-only (2021-12-15) 1 commit - ls-tree.c: support `--object-only` option for "git-ls-tree" "git ls-tree" learns "--oid-only" option, similar to "--name-only". Expecting a reroll. source: <cover.1638891420.git.dyroneteng@xxxxxxxxx> * 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 Dependency clean-up. Needs review. There are some comments on earlier rounds; the latest one needs a serious review or at least Acks from past commentors. source: <patch-v4-23.23-48a3927d972-20211117T101807Z-avarab@xxxxxxxxx> * ds/fetch-pull-with-sparse-index (2021-12-08) 6 commits . test-read-cache: remove --table, --expand options . t1091/t3705: remove 'test-tool read-cache --table' . t1092: replace 'read-cache --table' with 'ls-files --sparse' . 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.) "git fetch" and "git pull" are now declared sparse-index clean. Also "git ls-files" learns the "--sparse" option to help debugging. Ejected from 'seen', as it seems to fail its self-test. source: <pull.1080.v2.git.1638992395.gitgitgadget@xxxxxxxxx> * fs/ssh-signing-other-keytypes (2021-11-19) 2 commits (merged to 'next' on 2021-12-10 at 2d0c8cb8e6) + ssh signing: make sign/amend test more resilient + ssh signing: support non ssh-* keytypes The cryptographic signing using ssh keys can specify literal keys for keytypes whose name do not begin with the "ssh-" prefix by using the "key::" prefix mechanism (e.g. "key::ecdsa-sha2-nistp256"). Will merge to 'master'. source: <20211119150707.3924636-1-fs@xxxxxxxxxxxx> * pw/xdiff-classify-record-in-histogram (2021-12-04) 6 commits (merged to 'next' on 2021-12-07 at 8cdad7bc9a) + xdiff: drop unused flags parameter from recs_match + xdiff: drop xpparam_t parameter from histogram cmp_recs() + xdiff: drop CMP_ENV macro from xhistogram (merged to 'next' on 2021-12-02 at 5ccd12d09b) + xdiff: simplify comparison + xdiff: avoid unnecessary memory allocations + diff histogram: intern strings "diff --histogram" optimization. Will merge to 'master'. source: <Yammtm+pIkMu43zZ@xxxxxxxxxxxxxxxxxxxxxxx> source: <pull.1079.git.1637148025.gitgitgadget@xxxxxxxxx> * xw/am-empty (2021-12-07) 3 commits - am: support --allow-empty to record specific empty patches - am: support --empty=<option> to handle empty patches - doc: git-format-patch: describe the option --always "git am" learns "--empty=(die|drop|keep)" option to tweak what is done to a piece of e-mail without a patch in it. Almost there. source: <pull.1076.v18.git.1638939946.gitgitgadget@xxxxxxxxx> * jc/c99-var-decl-in-for-loop (2021-12-03) 1 commit (merged to 'next' on 2021-12-03 at 57100223b2) + revision: use C99 declaration of variable in for() loop Weather balloon to find compilers that do not grok variable declaration in the for() loop. Will merge to 'master'. source: <xmqqpmr2j5lq.fsf_-_@gitster.g> * ak/protect-any-current-branch (2021-12-01) 8 commits (merged to 'next' on 2021-12-10 at dd2c6a557c) + branch: protect branches checked out in all worktrees + receive-pack: protect current branch for bare repository worktree + receive-pack: clean dead code from update_worktree() + fetch: protect branches checked out in all worktrees + worktree: simplify find_shared_symref() memory ownership model + branch: lowercase error messages + receive-pack: lowercase error messages + fetch: lowercase error messages "git fetch" without the "--update-head-ok" option ought to protect a checked out branch from getting updated, to prevent the working tree that checks it out to go out of sync. The code was written before the use of "git worktree" got widespread, and only checked the branch that was checked out in the current worktree, which has been updated. (originally called ak/fetch-not-overwrite-any-current-branch) Will merge to 'master'. source: <20211201221547.1796213-1-andersk@xxxxxxx> * pw/diff-color-moved-fix (2021-12-09) 15 commits - diff --color-moved: intern strings - diff: use designated initializers for emitted_diff_symbol - diff --color-moved-ws=allow-indentation-change: improve hash lookups - diff --color-moved: stop clearing potential moved blocks - diff --color-moved: shrink potential moved blocks as we go - diff --color-moved: unify moved block growth functions - diff --color-moved: call comparison function directly - diff --color-moved-ws=allow-indentation-change: simplify and optimize - diff: simplify allow-indentation-change delta calculation - diff --color-moved: avoid false short line matches and bad zebra coloring - diff --color-moved=zebra: fix alternate coloring - diff --color-moved: rewind when discarding pmb - diff --color-moved: factor out function - diff --color-moved: clear all flags on blocks that are too short - diff --color-moved: add perf tests Correctness and performance update to "diff --color-moved" feature. Will merge to 'next'. source: <pull.981.v5.git.1639045809.gitgitgadget@xxxxxxxxx> * fs/ssh-signing-key-lifetime (2021-12-09) 9 commits (merged to 'next' on 2021-12-10 at d5e7bd8b79) + ssh signing: verify ssh-keygen in test prereq + ssh signing: make fmt-merge-msg consider key lifetime + ssh signing: make verify-tag consider key lifetime + ssh signing: make git log verify key lifetime + ssh signing: make verify-commit consider key lifetime + ssh signing: add key lifetime test prereqs + ssh signing: use sigc struct to pass payload + t/fmt-merge-msg: make gpgssh tests more specific + t/fmt-merge-msg: do not redirect stderr Extend the signing of objects with SSH keys and learn to pay attention to the key validity time range when verifying. Will merge to 'master'. source: <20211209085249.13587-1-fs@xxxxxxxxxxxx> * jc/doc-submitting-patches-choice-of-base (2021-10-25) 2 commits - (wip) reword the final review part - SubmittingPatchs: clarify choice of base and testing Extend the guidance to choose the base commit to build your work on, and hint/nudge contributors to read others' changes. Expecting a reroll. Stalled after one incremental update suggestion. cf. <xmqqa6ix2g6a.fsf@gitster.g> source: <xmqqa6izcwio.fsf_-_@gitster.g> * ab/config-based-hooks-2 (2021-11-24) 18 commits - run-command: remove old run_hook_{le,ve}() hook API - receive-pack: convert push-to-checkout hook to hook.h - read-cache: convert post-index-change to use hook.h - commit: convert {pre-commit,prepare-commit-msg} hook to hook.h - git-p4: use 'git hook' to run hooks - send-email: use 'git hook run' for 'sendemail-validate' - git hook run: add an --ignore-missing flag - hooks: convert worktree 'post-checkout' hook to hook library - hooks: convert non-worktree 'post-checkout' hook to hook library - merge: convert post-merge to use hook.h - am: convert applypatch-msg to use hook.h - rebase: convert pre-rebase to use hook.h - hook API: add a run_hooks_l() wrapper - am: convert {pre,post}-applypatch to use hook.h - gc: use hook library for pre-auto-gc hook - hook API: add a run_hooks() wrapper - hook: add 'run' subcommand - Merge branch 'ab/config-based-hooks-1' into ab/config-based-hooks-2 More "config-based hooks". Needs review. At this point, as Ævar and Emily both read the major part of this series, a final and quick read-over plus an Ack by Emily on her part plus a serious review on the patches attributed to Ævar by somebody other than Ævar would be sufficient to move it in some direction (hopefully forward). source: <cover-v5-00.17-00000000000-20211123T114206Z-avarab@xxxxxxxxx> * js/branch-track-inherit (2021-12-15) 3 commits - config: require lowercase for branch.autosetupmerge - branch: add flags and config to inherit tracking - branch: accept multiple upstream branches for tracking (this branch is used by gc/branch-recurse-submodules.) "git -c branch.autosetupmerge=inherit branch new old" makes "new" to have the same upstream as the "old" branch, instead of marking "old" itself as its upstream. source: <cover.1639524556.git.steadmon@xxxxxxxxxx> * jh/builtin-fsmonitor-part2 (2021-10-21) 29 commits - t7527: test status with untracked-cache and fsmonitor--daemon - fsmonitor: force update index after large responses - fsmonitor--daemon: use a cookie file to sync with file system - fsmonitor--daemon: periodically truncate list of modified files - t/perf/p7519: add fsmonitor--daemon test cases - t/perf/p7519: speed up test on Windows - t/helper/test-chmtime: skip directories on Windows - t/perf: avoid copying builtin fsmonitor files into test repo - t7527: create test for fsmonitor--daemon - t/helper/fsmonitor-client: create IPC client to talk to FSMonitor Daemon - help: include fsmonitor--daemon feature flag in version info - fsmonitor--daemon: implement handle_client callback - compat/fsmonitor/fsm-listen-darwin: implement FSEvent listener on MacOS - compat/fsmonitor/fsm-listen-darwin: add macos header files for FSEvent - compat/fsmonitor/fsm-listen-win32: implement FSMonitor backend on Windows - fsmonitor--daemon: create token-based changed path cache - fsmonitor--daemon: define token-ids - fsmonitor--daemon: add pathname classification - fsmonitor--daemon: implement 'start' command - fsmonitor--daemon: implement 'run' command - compat/fsmonitor/fsm-listen-darwin: stub in backend for Darwin - compat/fsmonitor/fsm-listen-win32: stub in backend for Windows - fsmonitor--daemon: implement 'stop' and 'status' commands - fsmonitor--daemon: add a built-in fsmonitor daemon - fsmonitor: document builtin fsmonitor - fsmonitor: use IPC to query the builtin FSMonitor daemon - fsmonitor: config settings are repository-specific - fsmonitor-ipc: create client routines for git-fsmonitor--daemon - fsmonitor: enhance existing comments Built-in fsmonitor (part 2). Expecting a reroll. Seems that the discussion stalled. cf. <d9c3ef61-768c-3560-2858-3438c355a742@xxxxxxxxxxxxxxxxx> source: <pull.1041.v4.git.1634826309.gitgitgadget@xxxxxxxxx> * ld/sparse-diff-blame (2021-12-06) 8 commits (merged to 'next' on 2021-12-10 at 57b89936d6) + blame: enable and test the sparse index + diff: enable and test the sparse index + diff: replace --staged with --cached in t1092 tests + repo-settings: prepare_repo_settings only in git repos + test-read-cache: set up repo after git directory + commit-graph: return if there is no git directory + git: ensure correct git directory setup with -h + Merge branch 'vd/sparse-reset' into ld/sparse-diff-blame (this branch is used by ds/fetch-pull-with-sparse-index.) Teach diff and blame to work well with sparse index. Will merge to 'master'. source: <pull.1050.v6.git.1638806161.gitgitgadget@xxxxxxxxx> * ns/tmp-objdir (2021-12-08) 2 commits - tmp-objdir: disable ref updates when replacing the primary odb - tmp-objdir: new API for creating temporary writable databases (this branch is used by ns/batched-fsync and ns/remerge-diff.) New interface into the tmp-objdir API to help in-core use of the quarantine feature. Will merge to 'next'. source: <pull.1091.v3.git.1638828305.gitgitgadget@xxxxxxxxx> * es/superproject-aware-submodules (2021-11-18) 5 commits - submodule: use config to find superproject worktree - submodule: record superproject gitdir during 'update' - submodule: record superproject gitdir during absorbgitdirs - introduce submodule.superprojectGitDir record - t7400-submodule-basic: modernize inspect() helper A configuration variable in a submodule points at the location of the superproject it is bound to (RFC). Expecting a reroll. cf. <20211117234300.2598132-1-jonathantanmy@xxxxxxxxxx> source: <20211117005701.371808-1-emilyshaffer@xxxxxxxxxx> * js/scalar (2021-12-04) 15 commits (merged to 'next' on 2021-12-10 at 6248603a80) + scalar: implement the `version` command + scalar: implement the `delete` command + scalar: teach 'reconfigure' to optionally handle all registered enlistments + scalar: allow reconfiguring an existing enlistment + scalar: implement the `run` command + scalar: teach 'clone' to support the --single-branch option + scalar: implement the `clone` subcommand + scalar: implement 'scalar list' + scalar: let 'unregister' handle a deleted enlistment directory gracefully + scalar: 'unregister' stops background maintenance + scalar: 'register' sets recommended config and starts maintenance + scalar: create test infrastructure + scalar: start documenting the command + scalar: create a rudimentary executable + scalar: add a README with a roadmap Add pieces from "scalar" to contrib/. Will merge to 'master'. source: <pull.1005.v10.git.1638538470.gitgitgadget@xxxxxxxxx> * ab/only-single-progress-at-once (2021-11-03) 8 commits - progress.c: add & assert a "global_progress" variable - various *.c: use isatty(0|2), not isatty(STDIN_FILENO|STDERR_FILENO) - pack-bitmap-write.c: don't return without stop_progress() - progress.c: add temporary variable from progress struct - progress.c tests: test some invalid usage - progress.c tests: make start/stop commands on stdin - progress.c test helper: add missing braces - leak tests: fix a memory leaks in "test-progress" helper Further tweaks on progress API. Needs review. The last three rounds has seen little reaction, even though earlier round saw a lot of responses. The latest round needs a serious review or at least Acks from past commentors. source: <cover-v6-0.8-00000000000-20211102T122507Z-avarab@xxxxxxxxx> -------------------------------------------------- [Discarded] * cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit . fetch: fix segfault on --set-upstream while on a detached HEAD "git fetch --set-upstream" while on detached HEAD segfaulted instead of noticing that such an operation did not make sense. Superseded by the ab/fetch-set-upstream-while-detached topic source: <20210706162238.575988-1-clemens@xxxxxxxxxxxxx> * js/compat-util-msvc-flex-array (2021-12-06) 1 commit . git-compat-util(msvc): C11 does not imply support for zero-sized arrays MSVC build started to break on flex arrays? It seems that there is no breakage in the toolchain; the code was buggy. source: <pull.1094.git.1638823724410.gitgitgadget@xxxxxxxxx> * ns/batched-fsync (2021-12-08) 8 commits . core.fsyncobjectfiles: performance tests for add and stash . core.fsyncobjectfiles: tests for batch mode . unpack-objects: use the bulk-checkin infrastructure . update-index: use the bulk-checkin infrastructure . core.fsyncobjectfiles: add windows support for batch mode . core.fsyncobjectfiles: batched disk flushes . bulk-checkin: rename 'state' variable and separate 'plugged' boolean . Merge branch 'ns/tmp-objdir' into ns/batched-fsync (this branch uses ns/tmp-objdir.) The "core.fsyncobjectfiles" configuration variable can now be set to "batch" for improved performance. cf. 20211211034452.GA15683@neerajsi-x1.localdomain source: <pull.1076.v9.git.git.1637020263.gitgitgadget@xxxxxxxxx> * ns/remerge-diff (2021-12-08) 8 commits . doc/diff-options: explain the new --remerge-diff option . show, log: adapt Elijah Newren's changes to common tmp-objdir API . show, log: provide a --remerge-diff capability . merge-ort: capture and print ll-merge warnings in our preferred fashion . ll-merge: add API for capturing warnings in a strbuf instead of stderr . merge-ort: add ability to record conflict messages in a file . merge-ort: mark a few more conflict messages as omittable . Merge branch 'ns/tmp-objdir' into ns/remerge-diff (this branch uses ns/tmp-objdir.) A new presentation for two-parent merge "--remerge-diff" can be used to show the difference between mechanical (and possibly conflicted) merge results and the recorded resolution. cf. <CABPp-BE4ZD4dsr=ofbZeWqxEV=8do93o_Gus_wsGw6Fq7V2ETA@xxxxxxxxxxxxxx> This is Elijah's remerge-diff rebased on ns/tmp-objdir to share the "create objects temporarily, only to discard without committing them to longer-term storage" infrastructure with another topic. * ms/customizable-ident-expansion (2021-09-01) 1 commit - keyword expansion: make "$Id$" string configurable Instead of "$Id$", user-specified string (like $FreeBSD$) can be used as an in-blob placeholder for keyword expansion. Will discard. Stalled for too long. cf. <xmqqfsuosvrh.fsf@gitster.g> cf. <211101.86fssf3bn3.gmgdl@xxxxxxxxxxxxxxxxxxx> source: <pull.1074.v3.git.git.1630462385587.gitgitgadget@xxxxxxxxx> * jc/make-test-all (2021-12-13) 2 commits . WIP to add "test-extra-clean" . Makefile: add test-all target "make test" target in subdirectories of contrib/ are now exercised in CI tests. source: <xmqqh7bi27o9.fsf@gitster.g> * jh/make-p4-python3-only (2021-12-09) 6 commits . git-p4: Resolve RCS keywords in binary . git-p4: Eliminate decode_stream and encode_stream . git-p4: Decode byte strings before printing . git-p4: Removed support for Python 2 . git-p4: Don't print shell commands as python lists . git-p4: Always pass cmd arguments to subprocess as a python lists Support for Python2 in "git p4" has been removed (not just deprecated). Superseded by jh/p4-rcs-expansion-in-bytestring topic, leaving the "drop Python-2 support" for a separate topic in the future. source: <20211209201029.136886-1-jholdsworth@xxxxxxxxxx>
