From: Junio C Hamano Date: Mon, 8 Mar 2021 23:20:21 +0000 (-0800) Subject: What's cooking (2021/03 #02) X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f54dd3f5763426c089851a99819dc66aa7c66bb;p=thirdparty%2Fgit.git What's cooking (2021/03 #02) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index c64691bd7e..271f53a7af 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,10 +1,10 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Mar 2021, #01; Tue, 2) -X-master-at: f01623b2c9d14207e497b21ebc6b3ec4afaf4b46 -X-next-at: b75b4e4ce211a6bec04cdfcb7eadec68c4e7c388 +Subject: What's cooking in git.git (Mar 2021, #02; Mon, 8) +X-master-at: be7935ed8bff19f481b033d0d242c5d5f239ed50 +X-next-at: 510d4cfa5f76b646b8e82232cbaed56bd0170dae -What's cooking in git.git (Mar 2021, #01; Tue, 2) +What's cooking in git.git (Mar 2021, #02; Mon, 8) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -12,7 +12,7 @@ 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. -A release candidate Git v2.31.0-rc1 has been tagged. +The second release candidate Git v2.31.0-rc2 will be tagged tomorrow. 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 @@ -45,512 +45,173 @@ Release tarballs are available at: -------------------------------------------------- [Graduated to 'master'] -* ab/detox-gettext-tests (2021-02-10) 4 commits - (merged to 'next' on 2021-02-17 at bd3d771557) - + tests: remove most uses of test_i18ncmp - + tests: remove last uses of C_LOCALE_OUTPUT - + tests: remove most uses of C_LOCALE_OUTPUT - + tests: remove last uses of GIT_TEST_GETTEXT_POISON=false - - Removal of GIT_TEST_GETTEXT_POISON continues. - - -* ab/diff-deferred-free (2021-02-11) 2 commits - (merged to 'next' on 2021-02-12 at 5e24106122) - + diff: plug memory leak from regcomp() on {log,diff} -I - + diff: add an API for deferred freeing - - A small memleak in "diff -I" has been corrected. - - -* ab/pager-exit-log (2021-02-01) 4 commits - (merged to 'next' on 2021-02-12 at ffe9f2d364) - + pager: properly log pager exit code when signalled - + run-command: add braces for "if" block in wait_or_whine() - + pager: test for exit code with and without SIGPIPE - + pager: refactor wait_for_pager() function - - When a pager spawned by us exited, the trace log did not record its - exit status correctly, which has been corrected. - The original "what should we do with SIGPIPE?" question remains, though. - - -* ab/test-lib (2021-02-12) 11 commits - (merged to 'next' on 2021-02-12 at 666a0422dc) - + test-lib-functions: assert correct parameter count - + test-lib-functions: remove bug-inducing "diagnostics" helper param - + test libs: rename "diff-lib" to "lib-diff" - + t/.gitattributes: sort lines - + test-lib-functions: move function to lib-bitmap.sh - + test libs: rename gitweb-lib.sh to lib-gitweb.sh - + test libs: rename bundle helper to "lib-bundle.sh" - + test-lib-functions: remove generate_zero_bytes() wrapper - + test-lib-functions: move test_set_index_version() to its user - + test lib: change "error" to "BUG" as appropriate - + test-lib: remove check_var_migration - (this branch is used by ab/pickaxe-pcre2.) - - Test framework clean-up. - - -* ah/commit-graph-leakplug (2021-02-22) 1 commit - (merged to 'next' on 2021-02-22 at 1330b452db) - + commit-graph: avoid leaking topo_levels slab in write_commit_graph() - - Plug a minor memory leak. - - -* ah/rebase-no-fork-point-config (2021-02-24) 1 commit - (merged to 'next' on 2021-02-24 at 8e56891909) - + 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. - - -* bc/signed-objects-with-both-hashes (2021-02-10) 6 commits - (merged to 'next' on 2021-02-11 at 391cc85104) - + 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. - - -* cw/pack-config-doc (2021-02-22) 1 commit - (merged to 'next' on 2021-02-22 at cfd2f5ccd1) - + doc: mention bigFileThreshold for packing - - Doc update. - - -* dl/doc-config-camelcase (2021-02-24) 3 commits - (merged to 'next' on 2021-02-24 at 5315e84c47) - + index-format doc: camelCase core.excludesFile - + blame-options.txt: camelcase blame.blankBoundary - + i18n.txt: camel case and monospace "i18n.commitEncoding" - - A handful of multi-word configuration variable names in - documentation that are spelled in all lowercase have been corrected - to use the more canonical camelCase. - - -* dl/stash-cleanup (2021-02-11) 7 commits - (merged to 'next' on 2021-02-11 at ae1cde1380) - + stash: declare ref_stash as an array - + t3905: use test_cmp() to check file contents - + t3905: replace test -s with test_file_not_empty - + t3905: remove nested git in command substitution - + t3905: move all commands into test cases - + t3905: remove spaces after redirect operators - + git-stash.txt: be explicit about subcommand options - (this branch is used by dl/stash-show-untracked.) - - Documentation, code and test clean-up around "git stash". - This is an early part of a topic that added a new feature to the - command, but the implementation is expected to need a handful of - iterations; I split the preparatory part up to fast-track it. - - -* ds/chunked-file-api (2021-02-24) 18 commits - (merged to 'next' on 2021-02-24 at 6002da063c) - + commit-graph.c: display correct number of chunks when writing - (merged to 'next' on 2021-02-22 at 5f0e28cfb2) - + 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 is used by ds/commit-graph-generation-config and tb/reverse-midx.) - - The common code to deal with "chunked file format" that is shared - by the multi-pack-index and commit-graph files have been factored - out, to help codepaths for both filetypes to become more robust. - - -* ds/merge-base-independent (2021-02-22) 5 commits - (merged to 'next' on 2021-02-24 at 9fad5352ea) - + commit-reach: stale commits may prune generation further - + commit-reach: use heuristic in remove_redundant() - + commit-reach: move compare_commits_by_gen - + commit-reach: use one walk in remove_redundant() - + commit-reach: reduce requirements for remove_redundant() - - The code to implement "git merge-base --independent" was poorly - done and was kept from the very beginning of the feature. - - -* en/diffcore-rename (2021-02-15) 8 commits - (merged to 'next' on 2021-02-22 at 243d0182da) - + merge-ort: call diffcore_rename() directly - + gitdiffcore doc: mention new preliminary step for rename detection - + diffcore-rename: guide inexact rename detection based on basenames - + diffcore-rename: complete find_basename_matches() - + diffcore-rename: compute basenames of source and dest candidates - + t4001: add a test comparing basename similarity and content similarity - + diffcore-rename: filter rename_src list when possible - + diffcore-rename: no point trying to find a match better than exact - - Performance optimization work on the rename detection continues. - - -* es/maintenance-of-bare-repositories (2021-02-23) 1 commit - (merged to 'next' on 2021-02-24 at 73a40e23b3) - + maintenance: fix incorrect `maintenance.repo` path with bare repository - - The "git maintenance register" command had trouble registering bare - repositories, which had been corrected. - - -* hn/reftable-tables-doc-update (2021-02-23) 1 commit - (merged to 'next' on 2021-02-25 at cfeadb4945) - + doc/reftable: document how to handle windows - - Documentation update. - - -* hv/trailer-formatting (2021-02-15) 4 commits - (merged to 'next' on 2021-02-25 at 7d1d5ecf59) - + ref-filter: use pretty.c logic for trailers - + pretty.c: capture invalid trailer argument - + pretty.c: refactor trailer logic to `format_set_trailers_options()` - + t6300: use function to test trailer options - - The logic to handle "trailer" related placeholders in the - "--format=" mechanisms in the "log" family and "for-each-ref" - family is getting unified. - - -* jc/diffcore-rotate (2021-02-16) 1 commit - (merged to 'next' on 2021-02-22 at f17c341d20) - + diff: --{rotate,skip}-to= - (this branch is used by zh/difftool-skip-to.) - - "git {diff,log} --{skip,rotate}-to=" allows the user to - discard diff output for early paths or move them to the end of the - output. - - -* jc/maint-column-doc-typofix (2021-02-19) 1 commit - (merged to 'next' on 2021-02-22 at d927f64824) - + Documentation: typofix --column description +* jk/open-returns-eintr (2021-03-01) 2 commits + (merged to 'next' on 2021-03-02 at 7f0218e627) + + config.mak.uname: enable OPEN_RETURNS_EINTR for macOS Big Sur + + Makefile: add OPEN_RETURNS_EINTR knob - Doc update. + Work around platforms whose open() is reported to return EINTR (it + shouldn't, as we do our signals with SA_RESTART). +-------------------------------------------------- +[New Topics] -* jc/push-delete-nothing (2021-02-23) 1 commit - (merged to 'next' on 2021-02-24 at 9d5481ea10) - + push: do not turn --delete '' into a matching push +* ab/make-cocci-dedup (2021-03-05) 4 commits + - Makefile/coccicheck: set SPATCH_BATCH_SIZE to 8 + - Makefile/coccicheck: allow for setting xargs concurrency + - Makefile/coccicheck: speed up and fix bug with duplicate hunks + - Makefile/coccicheck: add comment heading for all SPATCH flags - "git push $there --delete ''" should have been diagnosed as an - error, but instead turned into a matching push, which has been - corrected. + An attempt to speed up the coccicheck target with incorrect + results. + A reroll exists to address correctness issue, but not picked up. -* jh/fsmonitor-prework (2021-02-16) 11 commits - (merged to 'next' on 2021-02-17 at 1943efb5ac) - + fsmonitor: refactor initialization of fsmonitor_last_update token - + fsmonitor: allow all entries for a folder to be invalidated - + fsmonitor: log FSMN token when reading and writing the index - + fsmonitor: log invocation of FSMonitor hook to trace2 - + read-cache: log the number of scanned files to trace2 - + read-cache: log the number of lstat calls to trace2 - + preload-index: log the number of lstat calls to trace2 - + p7519: add trace logging during perf test - + p7519: move watchman cleanup earlier in the test - + p7519: fix watchman watch-list test on Windows - + p7519: do not rely on "xargs -d" in test - Preliminary changes to fsmonitor integration. +* ab/read-tree (2021-03-08) 6 commits + - tree.h API: remove "stage" parameter from read_tree_recursive() + - tree.h API: remove support for starting at prefix != "" + - ls-files: refactor away read_tree() + - ls-files: don't needlessly pass around stage variable + - tree.c API: move read_tree() into builtin/ls-files.c + - ls-files tests: add meaningful --with-tree tests + Code simplification by removing support for a caller that is long gone. + + Looked good. -* jh/untracked-cache-fix (2021-02-24) 1 commit - (merged to 'next' on 2021-02-25 at 79d1e40211) - + dir: fix malloc of root untracked_cache_dir - An under-allocation for the untracked cache data has been corrected. +* ab/unexpected-object-type (2021-03-08) 7 commits + - tag: don't misreport type of tagged objects in errors + - object tests: add test for unexpected objects in tags + - object.c: add a utility function for "expected type X, got Y" + - tree.c: fix misindentation in parse_tree_gently() + - oid_object_info(): return "enum object_type" + - object.c: make type_from_string() return "enum object_type" + - object.c: refactor type_from_string_gently() + Error reporting upon object type mismatch has been improved -* jk/rev-list-disk-usage (2021-02-17) 4 commits - (merged to 'next' on 2021-02-22 at 37a29a3495) - + docs/rev-list: add some examples of --disk-usage - + docs/rev-list: add an examples section - (merged to 'next' on 2021-02-11 at 6fb701f287) - + rev-list: add --disk-usage option for calculating disk usage - + t: add --no-tag option to test_commit - (this branch is used by ab/pickaxe-pcre2.) + Looked good. - "git rev-list" command learned "--disk-usage" option. +* ah/make-fuzz-all-doc-update (2021-03-04) 1 commit + - Makefile: update 'make fuzz-all' docs to reflect modern clang -* js/doc-proto-v2-response-end (2021-02-17) 1 commit - (merged to 'next' on 2021-02-17 at 9d5d479469) - + doc: fix naming of response-end-pkt + Update insn in Makefile comments to run fuzz-all target. - Docfix. + Needs review. + cf. + cf. -* js/params-vs-args (2021-02-23) 1 commit - (merged to 'next' on 2021-02-24 at 0a1ff0bc16) - + replace "parameters" by "arguments" in error messages +* ah/plugleaks (2021-03-08) 7 commits + - parse-options: don't leak alias help messages + - init-db: silence template_dir leak when converting to absolute path + - init: remove git_init_db_config() while fixing leaks + - worktree: fix leak in dwim_branch() + - clone: free or UNLEAK further pointers when finished + - reset: free instead of leaking unneeded ref + - symbolic-ref: don't leak shortened refname in check_symref() - Messages update. + Plug or annotate remaining leaks that trigger while running the + very basic set of tests. -* jt/transfer-fsck-across-packs (2021-02-22) 4 commits - (merged to 'next' on 2021-02-22 at 76f1327431) - + 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 +* bc/clone-bare-with-conflicting-config (2021-03-08) 1 commit + - builtin/init-db: handle bare clones when core.bare set to false - 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. + "git -c core.bare=false clone --bare ..." would have segfaulted, + which has been corrected. + Will merge to 'next'. -* ma/doc-markup-fix (2021-02-18) 3 commits - (merged to 'next' on 2021-02-22 at a8e9e712c8) - + gitmailmap.txt: fix rendering of e-mail addresses - + git.txt: fix monospace rendering - + rev-list-options.txt: fix rendering of bonus paragraph - Docfix. +* dl/cat-file-doc-cleanup (2021-03-03) 2 commits + - git-cat-file.txt: remove references to "sha1" + - git-cat-file.txt: monospace args, placeholders and filenames + Doc cleanup. -* mt/add-chmod-fixes (2021-02-24) 3 commits - (merged to 'next' on 2021-02-24 at 6c0977f3be) - + add: propagate --chmod errors to exit status - + add: mark --chmod error string for translation - + add --chmod: don't update index when --dry-run is used + Will merge to 'next'. - Various fixes on "git add --chmod". +* jh/simple-ipc-cleanups (2021-03-04) 9 commits + - SQUASH??? + - simple-ipc: update design documentation with more details + - test-simple-ipc: add --token= string option + - test-simple-ipc: refactor command line option processing in helper + - unix-stream-server: add st_dev and st_mode to socket stolen checks + - simple-ipc: move error handling up a level + - unix-stream-server: create unix-stream-server.c + - unix-socket: simplify initialization of unix_stream_listen_opts + - pkt-line: remove buffer arg from write_packetized_from_fd_no_flush() + (this branch uses jh/simple-ipc.) -* mt/checkout-index-corner-cases (2021-02-16) 2 commits - (merged to 'next' on 2021-02-17 at 81dad9735b) - + checkout-index: omit entries with no tempname from --temp output - + write_entry(): fix misuses of `path` in error messages - The error codepath around the "--temp/--prefix" feature of "git - checkout-index" has been improved. +* jr/doc-ignore-typofix (2021-03-03) 1 commit + - doc: .gitignore documentation typofix + Doc cleanup. -* mt/grep-sparse-checkout (2021-02-09) 1 commit - (merged to 'next' on 2021-02-24 at 246fc2ad56) - + grep: honor sparse-checkout on working tree searches + Will merge to 'next'. - "git grep" has been tweaked to be limited to the sparse checkout - paths. +* jt/transfer-fsck-across-packs-fix (2021-03-05) 1 commit + (merged to 'next' on 2021-03-07 at c79f295216) + + fetch-pack: do not mix --pack_header and packfile uri -* mz/doc-notes-are-not-anchors (2021-02-10) 1 commit - (merged to 'next' on 2021-02-17 at 81f92a74b2) - + docs: clarify that refs/notes/ do not keep the attached objects alive + The code to fsck objects received across multiple packs during a + single git fetch session has been broken when the packfile URI + feature was in use. A workaround has been added by disabling the + codepath to avoid keeping a packfile that is too small. - Objects that lost references can be pruned away, even when they - have notes attached to it (and these notes will become dangling, - which in turn can be pruned with "git notes prune"). This has been - clarified in the documentation. + Will merge to 'master'. -* ns/raise-write-index-buffer-size (2021-02-24) 1 commit - (merged to 'next' on 2021-02-25 at 8f43f67ba7) - + read-cache: make the index write buffer size 128K +* rr/mailmap-entry-self (2021-03-08) 1 commit + - Add entry for Ramkumar Ramachandra - Raise the buffer size used when writing the index file out from - (obviously too small) 8kB to (clearly sufficiently large) 128kB. - We may want to extend this to use a value the platform suggests as - the best size with a follow-up patch, but this should do for now. + Will merge to 'next'. -* rs/blame-optim (2021-02-17) 1 commit - (merged to 'next' on 2021-02-17 at e54665eeb3) - + blame: remove unnecessary use of get_commit_info() +* rs/xcalloc-takes-nelem-first (2021-03-08) 1 commit + - fix xcalloc() argument order - Optimization in "git blame" + Code cleanup. + Will merge to 'next'. -* sh/mergetools-vimdiff1 (2021-02-23) 1 commit - (merged to 'next' on 2021-02-24 at dbd4c6684c) - + mergetools/vimdiff: add vimdiff1 merge tool variant - Mergetools update. +* sv/t9801-test-path-is-file-cleanup (2021-03-03) 1 commit + - t9801: replace test -f with test_path_is_file + Test cleanup. -* sv/t7001-modernize (2021-02-11) 10 commits - (merged to 'next' on 2021-02-25 at 368861a00d) - + 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: avoid using `cd` outside of subshells - + t7001: remove whitespace after redirect operators - + t7001: modernize subshell formatting - + t7001: remove unnecessary blank lines - + t7001: indent with TABs instead of spaces - + t7001: modernize test formatting + Will merge to 'next'. - Test script modernization. +* tb/git-mv-icase-fix (2021-03-03) 1 commit + - git mv foo FOO ; git mv foo bar gave an assert -* ta/hash-function-transition-doc (2021-02-05) 6 commits - (merged to 'next' on 2021-02-12 at f620f3cfd3) - + doc: use https links - + doc hash-function-transition: move rationale upwards - + doc hash-function-transition: fix incomplete sentence - + doc hash-function-transition: use upper case consistently - + doc hash-function-transition: use SHA-1 and SHA-256 consistently - + doc hash-function-transition: fix asciidoc output + Fix a corner case bug in "git mv" on case insensitive systems, + which was introduced in 2.29 timeframe. - Update formatting and grammar of the hash transition plan - documentation, plus some updates. + Will merge to 'next'. -* ug/doc-commit-approxidate (2021-02-23) 1 commit - (merged to 'next' on 2021-02-24 at 825686380e) - + doc: mention approxidates for git-commit --date +* tb/push-simple-uses-branch-merge-config (2021-03-08) 1 commit + - Documentation/git-push.txt: correct configuration typo Doc update. - -* zh/difftool-skip-to (2021-02-22) 1 commit - (merged to 'next' on 2021-02-22 at eeff734f2b) - + difftool.c: learn a new way start at specified file - (this branch uses jc/diffcore-rotate.) - - "git difftool" learned "--skip-to=" option to restart an - interrupted session from an arbitrary path. - --------------------------------------------------- -[New Topics] - -* ab/remote-write-config-in-camel-case (2021-02-24) 2 commits - (merged to 'next' on 2021-03-01 at a01bd0d8e4) - + remote: write camel-cased *.pushRemote on rename - + remote: add camel-cased *.tagOpt key, like clone - - Update C code that sets a few configuration variables when a remote - is configured so that it spells configuration variable names in the - canonical camelCase. - - Will cook in 'next'. - - -* ds/commit-graph-generation-config (2021-02-25) 2 commits - (merged to 'next' on 2021-03-01 at 926537ea97) - + commit-graph: use config to specify generation type - + commit-graph: create local repository pointer - - A new configuration variable has been introduced to allow choosing - which version of the generation number gets used in the - commit-graph file. - - Will cook in 'next'. - - -* mt/cleanly-die-upon-missing-required-filter (2021-02-26) 1 commit - (merged to 'next' on 2021-03-01 at 357954af7c) - + convert: fail gracefully upon missing clean cmd on required filter - - We had a code to diagnose and die cleanly when a required - clean/smudge filter is missing, but an assert before that - unnecessarily fired, hiding the end-user facing die() message. - - Will cook in 'next'. - - -* ab/describe-tests-fix (2021-03-01) 10 commits - - test-lib: return 1 from test_expect_{success,failure} - - svn tests: refactor away a "set -e" in test body - - svn tests: remove legacy re-setup from init-clone test - - describe tests: support -C in "check_describe" - - describe tests: fix nested "test_expect_success" call - - describe tests: convert setup to use test_commit - - test-lib functions: add an --annotated-tag option to "test_commit" - - describe tests: always assert empty stderr from "describe" - - describe tests: refactor away from glob matching - - describe tests: improve test for --work-tree & --dirty - - Various updates to tests around "git describe" - - -* en/ort-perf-batch-8 (2021-02-26) 10 commits - - diffcore-rename: compute dir_rename_guess from dir_rename_counts - - diffcore-rename: limit dir_rename_counts computation to relevant dirs - - diffcore-rename: compute dir_rename_counts in stages - - diffcore-rename: extend cleanup_dir_rename_info() - - diffcore-rename: move dir_rename_counts into dir_rename_info struct - - diffcore-rename: add function for clearing dir_rename_count - - Move computation of dir_rename_count from merge-ort to diffcore-rename - - diffcore-rename: add a mapping of destination names to their indices - - diffcore-rename: provide basic implementation of idx_possible_rename() - - diffcore-rename: use directory rename guided basename comparisons - - Rename detection rework continues. - - -* jk/open-returns-eintr (2021-03-01) 2 commits - (merged to 'next' on 2021-03-02 at 7f0218e627) - + config.mak.uname: enable OPEN_RETURNS_EINTR for macOS Big Sur - + Makefile: add OPEN_RETURNS_EINTR knob - - Work around platforms whose open() is reported to return EINTR (it - shouldn't, as we do our signals with SA_RESTART). - - Will cook in 'next'. - - -* jk/perf-in-worktrees (2021-02-26) 2 commits - (merged to 'next' on 2021-03-02 at ea298cb298) - + t/perf: avoid copying worktree files from test repo - + t/perf: handle worktrees as test repos - - Perf test update to work better in secondary worktrees. - - Will cook in 'next'. - - -* ps/update-ref-trans-hook-doc (2021-03-01) 2 commits - - githooks.txt: clarify documentation on reference-transaction hook - - githooks.txt: replace mentions of SHA-1 specific properties - - -* tb/pack-revindex-on-disk (2021-02-26) 1 commit - - pack-revindex.c: don't close unopened file descriptors - - -* zh/format-patch-fractional-reroll-count (2021-03-01) 1 commit - - format-patch: allow a non-integral version numbers + cf. -------------------------------------------------- [Stalled] -* hn/reftable (2020-12-21) 16 commits +* hn/reftable (2021-03-08) 17 commits + - SQUASH??? calloc(nmemb,size) - SQUASH??? allow t0031 to run with any default branch name - Add "test-tool dump-reftable" command. - git-prompt: prepare for reftable refs backend @@ -613,17 +274,15 @@ Release tarballs are available at: cf. -* dl/stash-show-untracked (2021-02-16) 4 commits - - SQUASH??? - - SQUASH??? - - stash show: learn stash.showIncludeUntracked - - stash show: teach --include-untracked and --only-untracked +* dl/stash-show-untracked (2021-03-05) 2 commits + (merged to 'next' on 2021-03-08 at 510d4cfa5f) + + stash show: learn stash.showIncludeUntracked + + stash show: teach --include-untracked and --only-untracked "git stash show" learned to optionally show untracked part of the stash. - Expecting a reroll. - cf. + Will cook in 'next'. * ab/fsck-api-cleanup (2021-02-18) 10 commits @@ -689,6 +348,97 @@ Release tarballs are available at: -------------------------------------------------- [Cooking] +* ab/remote-write-config-in-camel-case (2021-02-24) 2 commits + (merged to 'next' on 2021-03-01 at a01bd0d8e4) + + remote: write camel-cased *.pushRemote on rename + + remote: add camel-cased *.tagOpt key, like clone + + Update C code that sets a few configuration variables when a remote + is configured so that it spells configuration variable names in the + canonical camelCase. + + Will cook in 'next'. + + +* ds/commit-graph-generation-config (2021-02-25) 2 commits + (merged to 'next' on 2021-03-01 at 926537ea97) + + commit-graph: use config to specify generation type + + commit-graph: create local repository pointer + + A new configuration variable has been introduced to allow choosing + which version of the generation number gets used in the + commit-graph file. + + Will cook in 'next'. + + +* mt/cleanly-die-upon-missing-required-filter (2021-02-26) 1 commit + (merged to 'next' on 2021-03-01 at 357954af7c) + + convert: fail gracefully upon missing clean cmd on required filter + + We had a code to diagnose and die cleanly when a required + clean/smudge filter is missing, but an assert before that + unnecessarily fired, hiding the end-user facing die() message. + + Will cook in 'next'. + + +* ab/describe-tests-fix (2021-03-01) 10 commits + - test-lib: return 1 from test_expect_{success,failure} + - svn tests: refactor away a "set -e" in test body + - svn tests: remove legacy re-setup from init-clone test + - describe tests: support -C in "check_describe" + - describe tests: fix nested "test_expect_success" call + - describe tests: convert setup to use test_commit + - test-lib functions: add an --annotated-tag option to "test_commit" + - describe tests: always assert empty stderr from "describe" + - describe tests: refactor away from glob matching + - describe tests: improve test for --work-tree & --dirty + + Various updates to tests around "git describe" + + +* en/ort-perf-batch-8 (2021-02-26) 10 commits + (merged to 'next' on 2021-03-07 at f03b2c1acd) + + diffcore-rename: compute dir_rename_guess from dir_rename_counts + + diffcore-rename: limit dir_rename_counts computation to relevant dirs + + diffcore-rename: compute dir_rename_counts in stages + + diffcore-rename: extend cleanup_dir_rename_info() + + diffcore-rename: move dir_rename_counts into dir_rename_info struct + + diffcore-rename: add function for clearing dir_rename_count + + Move computation of dir_rename_count from merge-ort to diffcore-rename + + diffcore-rename: add a mapping of destination names to their indices + + diffcore-rename: provide basic implementation of idx_possible_rename() + + diffcore-rename: use directory rename guided basename comparisons + + Rename detection rework continues. + + Will cook in 'next'. + + +* jk/perf-in-worktrees (2021-02-26) 2 commits + (merged to 'next' on 2021-03-02 at ea298cb298) + + t/perf: avoid copying worktree files from test repo + + t/perf: handle worktrees as test repos + + Perf test update to work better in secondary worktrees. + + Will cook in 'next'. + + +* ps/update-ref-trans-hook-doc (2021-03-01) 2 commits + - githooks.txt: clarify documentation on reference-transaction hook + - githooks.txt: replace mentions of SHA-1 specific properties + + +* tb/pack-revindex-on-disk (2021-02-26) 1 commit + - pack-revindex.c: don't close unopened file descriptors + + +* zh/format-patch-fractional-reroll-count (2021-03-01) 1 commit + - format-patch: allow a non-integral version numbers + + * ab/make-cleanup (2021-02-23) 6 commits - Makefile: build "$(FUZZ_OBJS)" in CI, not under "all" - Makefile: add {program,xdiff,test,git,fuzz}-objs & objects targets @@ -705,21 +455,21 @@ Release tarballs are available at: * ab/grep-pcre2-allocfix (2021-02-17) 10 commits - - grep/pcre2: move definitions of pcre2_{malloc,free} - - grep/pcre2: move back to thread-only PCREv2 structures - - grep/pcre2: actually make pcre2 use custom allocator - - grep/pcre2: use pcre2_maketables_free() function - - grep/pcre2: use compile-time PCREv2 version test - - grep/pcre2: add GREP_PCRE2_DEBUG_MALLOC debug mode - - grep/pcre2: prepare to add debugging to pcre2_malloc() - - grep/pcre2: correct reference to grep_init() in comment - - grep/pcre2: drop needless assignment to NULL - - grep/pcre2: drop needless assignment + assert() on opt->pcre2 + (merged to 'next' on 2021-03-04 at 26d2b726b1) + + grep/pcre2: move definitions of pcre2_{malloc,free} + + grep/pcre2: move back to thread-only PCREv2 structures + + grep/pcre2: actually make pcre2 use custom allocator + + grep/pcre2: use pcre2_maketables_free() function + + grep/pcre2: use compile-time PCREv2 version test + + grep/pcre2: add GREP_PCRE2_DEBUG_MALLOC debug mode + + grep/pcre2: prepare to add debugging to pcre2_malloc() + + grep/pcre2: correct reference to grep_init() in comment + + grep/pcre2: drop needless assignment to NULL + + grep/pcre2: drop needless assignment + assert() on opt->pcre2 Updates to memory allocation code around the use of pcre2 library. - Needs review. - cf. <20210218000728.13995-1-avarab@gmail.com> + Will cook in 'next'. * tb/reverse-midx (2021-02-24) 16 commits @@ -862,6 +612,7 @@ Release tarballs are available at: + pkt-line: (optionally) libify the packet readers + pkt-line: do not issue flush packets in write_packetized_*() + pkt-line: eliminate the need for static buffer in packet_write_gently() + (this branch is used by jh/simple-ipc-cleanups.) A simple IPC interface gets introduced to build services like fsmonitor on top. @@ -887,7 +638,13 @@ Release tarballs are available at: Will cook in 'next', together with "cm/rebase-i-updates". -* tb/geometric-repack (2021-02-22) 8 commits +* tb/geometric-repack (2021-03-05) 13 commits + (merged to 'next' on 2021-03-08 at def1c48d43) + + builtin/repack.c: reword comment around pack-objects flags + + builtin/repack.c: be more conservative with unsigned overflows + + builtin/repack.c: assign pack split later + + t7703: test --geometric repack with loose objects + + builtin/repack.c: do not repack single packs with --geometric (merged to 'next' on 2021-02-25 at a854fdbaff) + builtin/repack.c: add '--geometric' option + packfile: add kept-pack cache for find_kept_pack_entry()