Here are the topics that have been cooking. Commits prefixed with '-' are only in 'seen' (formerly 'pu'---proposed updates) while 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. 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/lose-grep-debug (2021-01-26) 1 commit - grep/log: remove hidden --debug and --grep-debug options Lose the debugging aid that may have been useful in the past, but no longer would be. Will merge to 'next'. * ds/chunked-file-api (2021-01-27) 17 commits - chunk-format: add technical docs - chunk-format: restore duplicate chunk checks - midx: use 64-bit multiplication for chunk sizes - midx: use chunk-format read API - commit-graph: use chunk-format read API - chunk-format: create read chunk API - midx: use chunk-format API in write_midx_internal() - midx: drop chunk progress during write - midx: return success/failure in chunk write methods - midx: add num_large_offsets to write_midx_context - midx: add pack_perm to write_midx_context - midx: add entries to write_midx_context - midx: use context in write_midx_pack_names() - midx: rename pack_info to write_midx_context - commit-graph: use chunk-format write API - chunk-format: create chunk format write API - commit-graph: anonymize data in chunk_write_fn (this branch uses ak/corrected-commit-date; is tangled with ds/merge-base-independent.) * ds/merge-base-independent (2021-01-28) 3 commits - commit-reach: use heuristic in remove_redundant() - commit-reach: move compare_commits_by_gen - commit-reach: use one walk in remove_redundant() (this branch uses ak/corrected-commit-date; is tangled with ds/chunked-file-api.) The code to implement "git merge-base --independent" was poorly done and was kept from the very beginning of the feature. Will merge to 'next'. * jk/pretty-lazy-load-commit (2021-01-28) 1 commit - pretty: lazy-load commit data when expanding user-format Some pretty-format specifiers do not need the data in commit object (e.g. "%H"), but we were over-eager to load and parse it, which has been made even lazier. Will merge to 'next'. * jk/t0000-cleanups (2021-01-28) 4 commits - t0000: consistently use single quotes for outer tests - t0000: run cleaning test inside sub-test - t0000: run prereq tests inside sub-test - t0000: keep clean-up tests together Code clean-up. Will merge to 'next'. * jk/use-oid-pos (2021-01-28) 6 commits - oid_pos(): access table through const pointers - hash_pos(): convert to oid_pos() - rerere: use strmap to store rerere directories - rerere: tighten rr-cache dirname check - rerere: check dirname format while iterating rr_cache directory - commit_graft_pos(): take an oid instead of a bare hash Code clean-up to ensure our use of hashtables using object names as keys use the "struct object_id" objects, not the raw hash values. Will merge to 'next'. * jk/weather-balloon-require-variadic-macro (2021-01-27) 1 commit - git-compat-util: always enable variadic macros We've carried compatibility codepaths for compilers without variadic macros for quite some time, but the world may be ready for them to be removed. Force compilation failure on exotic platforms where variadic macros are not available to find out who screams in such a way that we can easily revert if the world is not ready. Will merge to 'next'. * pb/ci-matrix-wo-shortcut (2021-01-27) 1 commit - ci: do not cancel all jobs of a matrix if one fails Our setting of GitHub CI test jobs were a bit too eager to give up once there is even one failure found. Tweak the knob to let independent jobs to keep running, so that we can find more failures in a single run. Will merge to 'next'. * sg/test-stress-jobs (2021-01-26) 1 commit - test-lib: prevent '--stress-jobs=X' from being ignored Test framework fix. Will merge to 'next'. * hv/trailer-formatting (2021-01-30) 5 commits - SQUASH??? - SQUASH: fix sparse error - ref-filter: use pretty.c logic for trailers - pretty.c: capture invalid trailer argument - pretty.c: refactor trailer logic to `format_set_trailers_options()` The logic to handle "trailer" related placeholders in the "--format=" mechanisms in the "log" family and "for-each-ref" family is getting unified. Expecting further work. * jk/p5303-sed-portability-fix (2021-01-29) 1 commit - p5303: avoid sed GNU-ism A perf script was made more portable. Will merge to 'next'. * pb/blame-funcname-range-userdiff (2021-01-30) 1 commit - annotate-tests: quote variable expansions containing path names Test fix. Will merge to 'next'. * sh/mergetool-hideresolved (2021-01-29) 3 commits - mergetool: add per-tool support and overrides for the hideResolved flag - mergetool: break setup_tool out into separate initialization function - mergetool: add hideResolved configuration "git mergetool" feeds three versions (base, local and remote) of a conflicted path unmodified. The command learned to optionally prepare these files with unconflicted parts already resolved. Getting there. * tb/precompose-prefix-too (2021-01-29) 1 commit - MacOS: precompose_argv_prefix() When commands are started from a subdirectory, they may have to compare the path to the subdirectory (called prefix and found out from $(pwd)) with the tracked paths. On macOS, $(pwd) and readdir() yield decomposed path, while the tracked paths are usually normalized to the precomposed form, causing mismatch. This has been fixed by taking the same approach used to normalize the command line arguments. Will merge to 'next'. -------------------------------------------------- [Stalled] * sg/t7800-difftool-robustify (2021-01-09) 1 commit - t7800-difftool: don't accidentally match tmp dirs Test fix. Not working on Windows. cf. https://github.com/git/git/runs/1660588243?check_suite_focus=true#step:7:4186 * fc/bash-completion-post-2.29 (2020-12-23) 4 commits . completion: bash: add correct suffix in variables . completion: bash: fix for multiple dash commands . completion: bash: fix for suboptions with value . completion: bash: fix prefix detection in branch.* Seems to break tests on Windows * ss/submodule-add-in-c (2020-12-15) 3 commits . t7400: add test to check 'submodule add' for tracked paths . submodule: port submodule subcommand 'add' from shell to C . dir: change the scope of function 'directory_exists_in_index()' "git submodule add" being rewritten in C. Expecting a reroll. The patches are split incorrectly; part of 1/3 belongs to 2/3 cf. <nycvar.QRO.7.76.6.2012190104140.56@xxxxxxxxxxxxxxxxx> It seems to introduce a segfault on 'seen'. cf. <xmqqft3xflw7.fsf@xxxxxxxxxxxxxxxxxxxxxx> * mt/grep-sparse-checkout (2020-12-06) 10 commits - t7817: do not depend on any specific default branch name - config: add setting to ignore sparsity patterns in some cmds - grep: honor sparse checkout patterns - config: correctly read worktree configs in submodules - config: make do_git_config_sequence receive a 'struct repository' - t/helper/test-config: unify exit labels - t/helper/test-config: diagnose missing arguments - t/helper/test-config: be consistent with exit codes - t1308-config-set: avoid false positives when using test-config - doc: grep: unify info on configuration variables (this branch is used by mt/rm-sparse-checkout.) "git grep" has been tweaked to be limited to the sparse checkout paths. Break out and fast-track bugfix from the remainder of the topic. cf. <CABPp-BFkACtF6LHkFJNt9dTOmwfQbf8ZO=BTrPYwPSmbqc9+hg@xxxxxxxxxxxxxx> * mt/rm-sparse-checkout (2020-12-08) 1 commit - rm: honor sparse checkout patterns (this branch uses mt/grep-sparse-checkout.) "git rm" follows suit to "git grep" to ignore paths outside the sparsity pattern when the sparse checkout feature is in use. Need to wait for how these fit in larger picture. cf. <CABPp-BGMX3wb7LiS1HkJpGveoW3J1oR0vVHbKTF5+qYLRF+59g@xxxxxxxxxxxxxx> cf. <CABPp-BFkACtF6LHkFJNt9dTOmwfQbf8ZO=BTrPYwPSmbqc9+hg@xxxxxxxxxxxxxx> * jk/symlinked-dotgitx-files (2020-10-23) 9 commits - docs: document symlink restrictions for .git* files - fsck: complain when .gitattributes or .gitignore is a symlink - verify_path(): disallow symlinks in .gitattributes and .gitignore - t0060: test obscured .gitattributes and .gitignore matching - t7450: test .gitmodules symlink matching against obscured names - t7450: test verify_path() handling of gitmodules - t7415: rename to expand scope - fsck_tree(): wrap some long lines - fsck_tree(): fix shadowed variable "git fsck" and the corresponding check done during the transport learned to ensure that in-tree files like `.gitignore` and `.gitattributes` are not symbolic links. It seems that there are real projects with .gitignore recorded as symlinks, which may need to loosen the fsck setting. Do we need to introduce a class that is separate from symlinked .gitmodules that has potential consequences that is more/less grave, so that these projects can opt out of the new checks? * sm/curl-retry (2020-10-13) 3 commits - http: automatically retry some requests - replace CURLOPT_FILE With CURLOPT_WRITEDATA - remote-curl: add testing for intelligent retry for HTTP The http transport has been taught to retry a failed request that may reasonably be retried. Expecting a reroll. cf. <20201015000410.GB328643@xxxxxxxxxx> cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@xxxxxxxxxxxxxx> * sv/t7001-modernize (2020-09-25) 11 commits - t7001: move cleanup code from outside the tests into them - t7001: use `test` rather than `[` - t7001: use here-docs instead of echo - t7001: put each command on a separate line - t7001: use ': >' rather than 'touch' - t7001: change (cd <path> && git foo) to (git -C <path> foo) - t7001: remove whitespace after redirect operators - t7001: change the style for cd according to subshell - t7001: remove unnecessary blank lines - t7001: use TAB instead of spaces - t7001: convert tests from the old style to the current style Test script modernization. Expecting a reroll. cf. <20200925170256.11490-1-shubhunic@xxxxxxxxx> * ar/fetch-transfer-ipversion (2020-09-16) 1 commit - config: option transfer.ipversion to set transport protocol version for network fetches Adds transfer.ipversion configuration variable. Needs more work. * jc/war-on-dashed-git (2020-12-21) 2 commits - fixup??? git: catch an attempt to run "git-foo" - git: catch an attempt to run "git-foo" The first step to remove on-disk binaries for built-in subcommands by soliciting objections. On hold for now. * 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". * ag/merge-strategies-in-c (2020-11-24) 13 commits - sequencer: use the "octopus" merge strategy without forking - sequencer: use the "resolve" strategy without forking - merge: use the "octopus" strategy without forking - merge: use the "resolve" strategy without forking - merge-octopus: rewrite in C - merge-recursive: move better_branch_name() to merge.c - merge-resolve: rewrite in C - merge-index: don't fork if the requested program is `git-merge-one-file' - merge-index: libify merge_one_path() and merge_all() - merge-one-file: rewrite in C - update-index: move add_cacheinfo() to read-cache.c - t6060: modify multiple files to expose a possible issue with merge-index - t6407: modernise tests The resolve and octopus merge strategy backends have been rewritten in C. Got enough review comments to get updated. -------------------------------------------------- [Cooking] * cm/rebase-i (2021-01-29) 9 commits - doc/git-rebase: add documentation for fixup [-C|-c] options - rebase -i: teach --autosquash to work with amend! - t3437: test script for fixup [-C|-c] options in interactive rebase - rebase -i: add fixup [-C | -c] command - sequencer: use const variable for commit message comments - sequencer: pass todo_item to do_pick_commit() - rebase -i: comment out squash!/fixup! subjects from squash message - sequencer: factor out code to append squash message - rebase -i: only write fixup-message when it's needed "rebase -i" is getting cleaned up and also enhanced. It seems to break t3415 when merged to 'seen'. * ds/maintenance-prefetch-cleanup (2021-01-20) 2 commits (merged to 'next' on 2021-01-26 at 23efa6ebc3) + t7900: clean up some broken refs + maintenance: set log.excludeDecoration durin prefetch Test clean-up plus UI improvement by hiding extra refs that the prefetch task uses from "log --decorate" output. Will merge to 'master'. * ds/more-index-cleanups (2021-01-23) 9 commits - t1092: test interesting sparse-checkout scenarios - test-lib: test_region looks for trace2 regions - sparse-checkout: load sparse-checkout patterns - name-hash: use trace2 regions for init - repository: add repo reference to index_state - fsmonitor: de-duplicate BUG()s around dirty bits - cache-tree: extract subtree_pos() - cache-tree: simplify verify_cache() prototype - cache-tree: clean up cache_tree_update() (this branch uses ds/cache-tree-basics.) Cleaning various codepaths up. Will merge to 'next'. * jt/packfile-as-uri-doc (2021-01-20) 1 commit (merged to 'next' on 2021-01-26 at 50500a8982) + Doc: clarify contents of packfile sent as URI Doc fix for packfile URI feature. Will merge to 'master'. * rs/worktree-list-verbose (2021-01-30) 7 commits - worktree: teach `list` verbose mode - worktree: teach `list` to annotate prunable worktree - worktree: teach `list --porcelain` to annotate locked worktree - t2402: ensure locked worktree is properly cleaned up - worktree: teach worktree_lock_reason() to gently handle main worktree - worktree: teach worktree to lazy-load "prunable" reason - worktree: libify should_prune_worktree() `git worktree list` now annotates worktrees as prunable, shows locked and prunable attributes in --porcelain mode, and gained a --verbose option. Will merge to 'next'. cf. <CAPig+cTt-TyOR8kc6YvBVLpf-bgFdJ+FVYA2NvG_Vvn7tMbBkQ@xxxxxxxxxxxxxx> * tb/geometric-repack (2021-01-20) 10 commits . builtin/repack.c: add '--geometric' option . builtin/repack.c: extract loose object handling . builtin/pack-objects.c: teach '--keep-pack-stdin' . packfile: add kept-pack cache for find_kept_pack_entry() . pack-objects: rewrite honor-pack-keep logic . p5303: measure time to repack with keep . p5303: add missing &&-chains . builtin/pack-objects.c: learn '--assume-kept-packs-closed' . revision: learn '--no-kept-objects' . packfile: introduce 'find_kept_pack_entry()' "git repack" so far has been only capable of repacking everything under the sun into a single pack (or split by size). A cleverer strategy to reduce the cost of repacking a repository has been introduced. Expecting further work. * zh/ls-files-deduplicate (2021-01-23) 3 commits (merged to 'next' on 2021-01-26 at af7522d2cf) + ls-files.c: add --deduplicate option + ls_files.c: consolidate two for loops into one + ls_files.c: bugfix for --deleted and --modified "git ls-files" can and does show multiple entries when the index is unmerged, which is a source for confusion unless -s/-u option is in use. A new option --deduplicate has been introduced. Will merge to 'master'. * ah/rebase-no-fork-point-config (2021-01-21) 1 commit - rebase: add a config option for --no-fork-point "git rebase --[no-]fork-point" gained a configuration variable rebase.forkPoint so that users do not have to keep specifying a non-default setting. Expecting a reroll to update its tests. cf. <CAMMLpeTDNLUz9UVnL3aVK=J7X50Sq8L-OVGaoEsT5AY6EQON-g@xxxxxxxxxxxxxx> * jk/peel-iterated-oid (2021-01-21) 1 commit (merged to 'next' on 2021-01-26 at 023758f4ee) + refs: switch peel_ref() to peel_iterated_oid() The peel_ref() API has been replaced with peel_iterated_oid(). Will merge to 'master'. * jk/run-command-use-shell-doc (2021-01-22) 1 commit (merged to 'next' on 2021-01-26 at f9df80d861) + run-command: document use_shell option The .use_shell flag in struct child_process that is passed to run_command() API has been clarified with a bit more documentation. Will merge to 'master'. * js/range-diff-wo-dotdot (2021-01-27) 3 commits - range-diff(docs): explain how to specify commit ranges - range-diff/format-patch: handle commit ranges other than A..B - range-diff/format-patch: refactor check for commit range There are other ways than ".." for a single token to denote a "commit range", namely "<rev>^!" and "<rev>^-<n>", but "git range-diff" did not understand them. Getting there. cf. <pull.841.v3.git.1611765444.gitgitgadget@xxxxxxxxx> * js/skip-dashed-built-ins-from-config-mak (2021-01-21) 1 commit (merged to 'next' on 2021-01-26 at 2d727a37f9) + SKIP_DASHED_BUILT_INS: respect `config.mak` Build fix. Will merge to 'master'. * jx/t5411-unique-filenames (2021-01-22) 2 commits - t5411: refactor check of refs using test_cmp_refs - t5411: use different out file to prevent overwriting Avoid individual tests in t5411 from getting affected by each other by forcing them to use separate output files during the test. * ph/use-delete-refs (2021-01-21) 1 commit (merged to 'next' on 2021-01-26 at e03486152e) + use delete_refs when deleting tags or branches When removing many branches and tags, the code used to do so one ref at a time. There is another API it can use to delete multiple refs, and it makes quite a lot of performance difference when the refs are packed. Will merge to 'master'. * tb/ls-refs-optim (2021-01-22) 3 commits (merged to 'next' on 2021-01-26 at 09edbf7d9a) + ls-refs.c: traverse prefixes of disjoint "ref-prefix" sets + ls-refs.c: initialize 'prefixes' before using it + refs: expose 'for_each_fullref_in_prefixes' The ls-refs protocol operation has been optimized to narrow the sub-hierarchy of refs/ it walks to produce response. Will merge to 'master'. * ab/grep-pcre-invalid-utf8 (2021-01-24) 2 commits - grep/pcre2: better support invalid UTF-8 haystacks - grep/pcre2 tests: don't rely on invalid UTF-8 data test Update support for invalid UTF-8 in PCRE2. Will merge to 'next'. * ab/retire-pcre1 (2021-01-23) 2 commits - Remove support for v1 of the PCRE library - config.mak.uname: remove redundant NO_LIBPCRE1_JIT flag The support for deprecated PCRE1 library has been dropped. Will merge to 'next'. * jt/transfer-fsck-across-packs (2021-01-25) 5 commits - SQUASH??? test fix - fetch-pack: print and use dangling .gitmodules - fetch-pack: with packfile URIs, use index-pack arg - http-fetch: allow custom index-pack args - http: allow custom index-pack args The approach to "fsck" the incoming objects in "index-pack" is attractive for performance reasons (we have them already in core, inflated and ready to be inspected), but fundamentally cannot be applied fully when we receive more than one pack stream, as a tree object in one pack may refer to a blob object in another pack as ".gitmodules", when we want to inspect blobs that are used as ".gitmodules" file, for example. Teach "index-pack" to emit objects that must be inspected later and check them in the calling "fetch-pack" process. * jv/pack-objects-narrower-ref-iteration (2021-01-22) 1 commit (merged to 'next' on 2021-01-26 at 8a0d178c01) + builtin/pack-objects.c: avoid iterating all refs The "pack-objects" command needs to iterate over all the tags when automatic tag following is enabled, but it actually iterated over all refs and then discarded everything outside "refs/tags/" hierarchy, which was quite wasteful. Will merge to 'master'. * jv/upload-pack-filter-spec-quotefix (2021-01-28) 1 commit - upload-pack.c: fix filter spec quoting bug Fix in passing custom args from "git clone" to "upload-pack" on the other side. Will merge to 'next'. * ab/fsck-doc-fix (2021-01-20) 1 commit (merged to 'next' on 2021-01-25 at e3db0fe96f) + fsck doc: remove ancient out-of-date diagnostics Documentation for "git fsck" lost stale bits that has become incorrect. Will merge to 'master'. * ab/tests-various-fixup (2021-01-23) 10 commits - rm tests: actually test for SIGPIPE in SIGPIPE test - archive tests: use a cheaper "zipinfo -h" invocation to get header - upload-pack tests: avoid a non-zero "grep" exit status - git-svn tests: rewrite brittle tests to use "--[no-]merges". - git svn mergeinfo tests: refactor "test -z" to use test_must_be_empty - git svn mergeinfo tests: modernize redirection & quoting style - cache-tree tests: explicitly test HEAD and index differences - cache-tree tests: use a sub-shell with less indirection - cache-tree tests: remove unused $2 parameter - cache-tree tests: refactor for modern test style Various test updates. Will merge to 'next'. * en/ort-directory-rename (2021-01-20) 18 commits - merge-ort: fix a directory rename detection bug - merge-ort: process_renames() now needs more defensiveness - merge-ort: implement apply_directory_rename_modifications() - merge-ort: add a new toplevel_dir field - merge-ort: implement handle_path_level_conflicts() - merge-ort: implement check_for_directory_rename() - merge-ort: implement apply_dir_rename() and check_dir_renamed() - merge-ort: implement compute_collisions() - merge-ort: modify collect_renames() for directory rename handling - merge-ort: implement handle_directory_level_conflicts() - merge-ort: implement compute_rename_counts() - merge-ort: copy get_renamed_dir_portion() from merge-recursive.c - merge-ort: add outline of get_provisional_directory_renames() - merge-ort: add outline for computing directory renames - merge-ort: collect which directories are removed in dirs_removed - merge-ort: initialize and free new directory rename data structures - merge-ort: add new data structures for directory rename detection - Merge branch 'en/merge-ort-3' into en/ort-directory-rename (this branch is used by en/merge-ort-perf.) ORT merge strategy learns to infer "renamed directory" while merging. Will merge to 'next'. * ab/detox-gettext-tests (2021-01-21) 3 commits - tests: remove uses of GIT_TEST_GETTEXT_POISON=false - tests: remove support for GIT_TEST_GETTEXT_POISON - ci: remove GETTEXT_POISON jobs Get rid of "GETTEXT_POISON" support altogether, which may or may not be controversial. * bc/signed-objects-with-both-hashes (2021-01-18) 6 commits - gpg-interface: remove other signature headers before verifying - ref-filter: hoist signature parsing - commit: allow parsing arbitrary buffers with headers - gpg-interface: improve interface for parsing tags - commit: ignore additional signatures when parsing signed commits - ref-filter: switch some uses of unsigned long to size_t Signed commits and tags now allow verification of objects, whose two object names (one in SHA-1, the other in SHA-256) are both signed. Looking good. * js/rebase-i-commit-cleanup-fix (2021-01-28) 1 commit - rebase -i: do leave commit message intact in fixup! chains When "git rebase -i" processes "fixup" insn, there is no reason to clean up the commit log message, but we did the usual stripspace processing. This has been corrected. Will merge to 'next'. * tb/pack-revindex-on-disk (2021-01-28) 10 commits - t5325: check both on-disk and in-memory reverse index - pack-revindex: ensure that on-disk reverse indexes are given precedence - t: support GIT_TEST_WRITE_REV_INDEX - t: prepare for GIT_TEST_WRITE_REV_INDEX - Documentation/config/pack.txt: advertise 'pack.writeReverseIndex' - builtin/pack-objects.c: respect 'pack.writeReverseIndex' - builtin/index-pack.c: write reverse indexes - builtin/index-pack.c: allow stripping arbitrary extensions - pack-write.c: prepare to write 'pack-*.rev' files - packfile: prepare for the existence of '*.rev' files Introduce an on-disk file to record revindex for packdata, which traditionally was always created on the fly and only in-core. Looking good. * en/merge-ort-perf (2021-01-23) 6 commits - merge-ort: begin performance work; instrument with trace2_region_* calls - merge-ort: ignore the directory rename split conflict for now - merge-ort: fix massive leak - Merge branch 'en/ort-directory-rename' into en/merge-ort-perf - Merge branch 'en/ort-conflict-handling' into en/merge-ort-perf - Merge branch 'en/diffcore-rename' into en/merge-ort-perf (this branch uses en/ort-conflict-handling and en/ort-directory-rename.) The "ort" merge strategy. Will merge to 'next'. * ds/cache-tree-basics (2021-01-15) 10 commits (merged to 'next' on 2021-01-25 at 29ee74df7b) + cache-tree: speed up consecutive path comparisons + cache-tree: use ce_namelen() instead of strlen() + index-format: discuss recursion of cache-tree better + index-format: update preamble to cache tree extension + index-format: use 'cache tree' over 'cached tree' + cache-tree: trace regions for prime_cache_tree + cache-tree: trace regions for I/O + cache-tree: use trace2 in cache_tree_update() + unpack-trees: add trace2 regions + tree-walk: report recursion counts (this branch is used by ds/more-index-cleanups.) Document, clean-up and optimize the code around the cache-tree extension in the index. Will merge to 'master'. * en/ort-conflict-handling (2021-01-04) 10 commits (merged to 'next' on 2021-01-25 at 369c1516c4) + merge-ort: add handling for different types of files at same path + merge-ort: copy find_first_merges() implementation from merge-recursive.c + merge-ort: implement format_commit() + merge-ort: copy and adapt merge_submodule() from merge-recursive.c + merge-ort: copy and adapt merge_3way() from merge-recursive.c + merge-ort: flesh out implementation of handle_content_merge() + merge-ort: handle book-keeping around two- and three-way content merge + merge-ort: implement unique_path() helper + merge-ort: handle directory/file conflicts that remain + merge-ort: handle D/F conflict where directory disappears due to merge (this branch is used by en/merge-ort-perf.) ORT merge strategy learns more support for merge conflicts. Will merge to 'master'. * ak/corrected-commit-date (2021-01-18) 11 commits (merged to 'next' on 2021-01-26 at deae33ec7d) + doc: add corrected commit date info + commit-reach: use corrected commit dates in paint_down_to_common() + commit-graph: use generation v2 only if entire chain does + commit-graph: implement generation data chunk + commit-graph: implement corrected commit date + commit-graph: return 64-bit generation number + commit-graph: add a slab to store topological levels + t6600-test-reach: generalize *_three_modes + commit-graph: consolidate fill_commit_graph_info + revision: parse parent in indegree_walk_step() + commit-graph: fix regression when computing Bloom filters (this branch is used by ds/chunked-file-api and ds/merge-base-independent.) The commit-graph learned to use corrected commit dates instead of the generation number to help topological revision traversal. Will merge to 'master'. * mr/bisect-in-c-4 (2021-01-26) 7 commits - bisect--helper: retire `--check-and-set-terms` subcommand - bisect--helper: reimplement `bisect_skip` shell function in C - bisect--helper: retire `--bisect-auto-next` subcommand - bisect--helper: use `res` instead of return in BISECT_RESET case option - bisect--helper: retire `--bisect-write` subcommand - bisect--helper: reimplement `bisect_replay` shell function in C - bisect--helper: reimplement `bisect_log` shell function in C Piecemeal of rewrite of "git bisect" in C continues. Will merge to 'next'. * jt/clone-unborn-head (2021-01-28) 5 commits - transport-internal.h: fix a 'hdr-check' warning - ls-refs: don't peel NULL oid - clone: respect remote unborn HEAD - connect, transport: encapsulate arg in struct - ls-refs: report unborn targets of symrefs "git clone" tries to locally check out the branch pointed at by HEAD of the remote repository after it is done, but the protocol did not convey the information necessary to do so when copying an empty repository. The protocol v2 learned how to do so. Looking good, but the tip one from Ramsay may want to be squashed into the step that introduces the problem. * mt/parallel-checkout-part-1 (2020-12-16) 9 commits - entry: add checkout_entry_ca() taking preloaded conv_attrs - entry: move conv_attrs lookup up to checkout_entry() - entry: extract update_ce_after_write() from write_entry() - entry: make fstat_output() and read_blob_entry() public - entry: extract a header file for entry.c functions - convert: add classification for conv_attrs struct - convert: add get_stream_filter_ca() variant - convert: add [async_]convert_to_working_tree_ca() variants - convert: make convert_attrs() and convert structs public Parallel checkout. Looking good. * so/log-diff-merge (2020-12-21) 32 commits (merged to 'next' on 2021-01-25 at 63977ef287) + t4013: add tests for --diff-merges=first-parent + doc/git-show: include --diff-merges description + doc/rev-list-options: document --first-parent changes merges format + doc/diff-generate-patch: mention new --diff-merges option + doc/git-log: describe new --diff-merges options + diff-merges: add '--diff-merges=1' as synonym for 'first-parent' + diff-merges: add old mnemonic counterparts to --diff-merges + diff-merges: let new options enable diff without -p + diff-merges: do not imply -p for new options + diff-merges: implement new values for --diff-merges + diff-merges: make -m/-c/--cc explicitly mutually exclusive + diff-merges: refactor opt settings into separate functions + diff-merges: get rid of now empty diff_merges_init_revs() + diff-merges: group diff-merge flags next to each other inside 'rev_info' + diff-merges: split 'ignore_merges' field + diff-merges: fix -m to properly override -c/--cc + t4013: add tests for -m failing to override -c/--cc + t4013: support test_expect_failure through ':failure' magic + diff-merges: revise revs->diff flag handling + diff-merges: handle imply -p on -c/--cc logic for log.c + diff-merges: introduce revs->first_parent_merges flag + diff-merges: new function diff_merges_set_dense_combined_if_unset() + diff-merges: new function diff_merges_suppress() + diff-merges: re-arrange functions to match the order they are called in + diff-merges: rename diff_merges_default_to_enable() to match semantics + diff-merges: move checks for first_parent_only out of the module + diff-merges: rename all functions to have common prefix + revision: move diff merges functions to its own diff-merges.c + revision: provide implementation for diff merges tweaks + revision: factor out initialization of diff-merge related settings + revision: factor out setup of diff-merge related settings + revision: factor out parsing of diff-merge related options "git log" learned a new "--diff-merges=<how>" option. Will merge to 'master'. * es/config-hooks (2020-12-21) 34 commits - run-command: stop thinking about hooks - receive-pack: convert receive hooks to hook.h - post-update: use hook.h library - proc-receive: acquire hook list from hook.h - receive-pack: convert 'update' hook to hook.h - reference-transaction: look for hooks in config - transport: convert pre-push hook to use config - hook: convert 'post-rewrite' hook to config - hooks: convert 'post-checkout' hook to hook library - git-p4: use 'git hook' to run hooks - receive-pack: convert push-to-checkout hook to hook.h - read-cache: convert post-index-change hook to use config - rebase: teach pre-rebase to use hook.h - gc: use hook library for pre-auto-gc hook - merge: use config-based hooks for post-merge hook - am: convert applypatch hooks to use config - commit: use config-based hooks - hooks: allow callers to capture output - run-command: allow capturing of collated output - hook: provide stdin by string_list or callback - run-command: add stdin callback for parallelization - hook: allow specifying working directory for hooks - hook: allow parallel hook execution - run-command: allow stdin for run_processes_parallel - hook: support passing stdin to hooks - hook: replace find_hook() with hook_exists() - hook: add 'run' subcommand - parse-options: parse into strvec - hook: implement hookcmd.<name>.skip - hook: respect hook.runHookDir - hook: include hookdir hook in list - hook: add list command - hook: scaffolding for git-hook subcommand - doc: propose hooks managed by the config The "hooks defined in config" topic. Expecting doc updates, but otherwise seems to be progressing nicely. * hn/reftable (2020-12-21) 16 commits - SQUASH??? allow t0031 to run with any default branch name - Add "test-tool dump-reftable" command. - git-prompt: prepare for reftable refs backend - Reftable support for git-core - reftable: rest of library - reftable: reftable file level tests - reftable: read reftable files - reftable: write reftable files - reftable: a generic binary tree implementation - reftable: reading/writing blocks - 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 - init-db: set the_repository->hash_algo early on The "reftable" backend for the refs API. -------------------------------------------------- [Discarded] * ds/update-index (2021-01-09) 14 commits . update-index: remove static globals from callbacks . update-index: reduce static globals, part 2 . update-index: reduce static globals, part 1 . update-index: remove ce_match_stat(), all macros . update-index: replace several compatibility macros . update-index: use add_index_entry() . update-index: use remove_file_from_index() . update-index: use index_name_pos() over cache_name_pos() . update-index: use istate->cache_changed . update-index: use istate->cache_nr over active_nr . update-index: use istate->cache over active_cache . update-index: drop the_index, the_repository . rm: remove compatilibity macros . mv: remove index compatibility macros (this branch uses ag/merge-strategies-in-c.) The implementation of a few commands lost reliance of "the_index" compatibility macros by explicitly passing the index_state through the callchain. Retracted for now. cf. <a6906459-3a93-ecad-c460-b6c763819389@xxxxxxxxx> * fc/mergetool-automerge (2021-01-09) 8 commits . fixup! mergetool: break setup_tool out into separate initialization function . fixup! fixup! mergetool: add automerge configuration . fixup! mergetool: add automerge configuration . mergetool: add automerge_enabled tool-specific override function . mergetool: break setup_tool out into separate initialization function . mergetool: add per-tool support for the autoMerge flag . mergetool: alphabetize the mergetool config docs . mergetool: add automerge configuration "git mergetool" feeds three versions (base, local and remote) of a conflicted path unmodified. The command learned to optionally prepare these files with unconflicted parts already resolved. Superseded by the sh/mergetool-hideresolved topic.
