diff options
author | Taylor Blau <me@ttaylorr.com> | 2022-11-09 02:09:59 +0300 |
---|---|---|
committer | Taylor Blau <me@ttaylorr.com> | 2022-11-09 02:10:18 +0300 |
commit | 9e3f2dfb754145f8d2b0b45c2be1ca2e16fbe2f6 (patch) | |
tree | 08452b7af1f65bcaa065e57afd96dc3c9fc5d5cb | |
parent | 5a2ca43ef7e17617fcb7127ef0ecfbe333dd0091 (diff) |
What's cooking (2022/11 #2)todo
-rw-r--r-- | whats-cooking.txt | 700 |
1 files changed, 473 insertions, 227 deletions
diff --git a/whats-cooking.txt b/whats-cooking.txt index 6015121a11a..933babd146a 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,10 +1,10 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Nov 2022, #01; Thu, 3) -X-master-at: 3b08839926fcc7cc48cf4c759737c1a71af430c1 -X-next-at: 58b659f92b25267976ae36dbe1e7cb129f8f5311 +Subject: What's cooking in git.git (Nov 2022, #02; Tue, 8) +X-master-at: 319605f8f00e402f3ea758a02c63534ff800a711 +X-next-at: 0f3c55d4c2b7864bffb2d92278eff08d0b2e083f Bcc: lwn@lwn.net, gitster@pobox.com -What's cooking in git.git (Nov 2022, #01; Thu, 3) +What's cooking in git.git (Nov 2022, #02; Tue, 8) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -14,9 +14,11 @@ release). Commits prefixed with '-' are only in 'seen', and aren't considered "accepted" at all. A topic without enough support may be discarded after a long period of no activity. -A large-ish handful of topics are awaiting review. I'll continue to -hold those topics in 'seen' until they have enough attention to feel -comfortable merging them down. +A handful of topics are still sitting in 'seen' waiting review. They +are marked accordingly below. Otherwise, a number of topics have +graduated, and the slate for 'next' is relatively small. Hopefully +some additional review effort will mean that we can graduate some of +those topics to 'next' in the next round of integration. 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 @@ -51,38 +53,25 @@ for convenience (replace "htmldocs" with "manpages" for the manual https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- -[New Topics] - -* ab/submodule-helper-prep-only (2022-11-02) 8 commits - - submodule--helper: use OPT_SUBCOMMAND() API - - submodule--helper: drop "update --prefix <pfx>" for "-C <pfx> update" - - submodule--helper: remove --prefix from "absorbgitdirs" - - submodule API & "absorbgitdirs": remove "----recursive" option - - submodule.c: refactor recursive block out of absorb function - - submodule tests: test for a "foreach" blind-spot - - submodule tests: add tests for top-level flag output - - submodule--helper: move "config" to a test-tool +[Graduated to 'master'] - Preparation to remove git-submodule.sh and replace it with a builtin. - - Waiting for review? - source: <cover-0.8-00000000000-20221102T074148Z-avarab@gmail.com> +* es/mark-gc-cruft-as-experimental (2022-10-26) 2 commits + (merged to 'next' on 2022-11-03 at 4079e1b06b) + + config: let feature.experimental imply gc.cruftPacks=true + + gc: add tests for --cruft and friends + Enable gc.cruftpacks by default for those who opt into + feature.experimental setting. + source: <cover.1666819953.git.me@ttaylorr.com> -* ds/bundle-uri-4 (2022-10-31) 9 commits - - clone: unbundle the advertised bundles - - bundle-uri: download bundles from an advertised list - - bundle-uri: allow relative URLs in bundle lists - - strbuf: reintroduce strbuf_parent_directory() - - bundle-uri client: add boolean transfer.bundleURI setting - - bundle-uri: serve bundle.* keys from config - - bundle-uri client: add helper for testing server - - bundle-uri client: add minimal NOOP client - - protocol v2: add server-side "bundle-uri" skeleton - Bundle URIs part 4. +* jc/set-gid-bit-less-aggressively (2022-10-28) 1 commit + (merged to 'next' on 2022-11-03 at 32bfd99ffd) + + adjust_shared_perm(): leave g+s alone when the group does not matter - source: <pull.1400.git.1667264854.gitgitgadget@gmail.com> + The adjust_shared_perm() helper function learned to refrain from + setting the "g+s" bit on directories when it is not necessary. + source: <xmqqr0yrhco6.fsf@gitster.g> * jk/ref-filter-parsing-bugs (2022-11-02) 2 commits @@ -93,8 +82,6 @@ for convenience (replace "htmldocs" with "manpages" for the manual Various tests exercising the transfer.credentialsInUrl configuration are taught to avoid making requests which require resolving localhost to reduce CI-flakiness. - - Will merge to 'master'. source: <Y2IeqOT5Ao1Qa0Zl@coredump.intra.peff.net> @@ -103,70 +90,318 @@ for convenience (replace "htmldocs" with "manpages" for the manual + test-lib-functions: drop redundant diagnostic print A redundant diagnostic message is dropped from test_path_is_missing(). - - Will merge to 'master'. source: <20221031180048.5766-1-martin.agren@gmail.com> -* sg/plug-line-log-leaks (2022-11-02) 3 commits - - diff.c: use diff_free_queue() - - line-log: free the diff queues' arrays when processing merge commits - - line-log: free diff queue when processing non-merge commits +* po/glossary-around-traversal (2022-10-30) 4 commits + (merged to 'next' on 2022-11-03 at 58b659f92b) + + glossary: add reachability bitmap description + + glossary: add "commit graph" description + + doc: use 'object database' not ODB or abbreviation + + doc: use "commit-graph" hyphenation consistently - A handful of leaks in the line-log machinery have been plugged. + The glossary entries for "commit-graph file" and "reachability + bitmap" have been added. + source: <20221029164112.2097-1-philipoakley@iee.email> - Expecting a reroll. - source: <20221102220142.574890-1-szeder.dev@gmail.com> +* rs/archive-filter-error-once (2022-10-30) 1 commit + (merged to 'next' on 2022-11-03 at c2d1004d96) + + archive-tar: report filter start error only once -* tb/branch-delete-detached (2022-11-01) 1 commit - - branch: gracefully handle '-d' on detached HEAD + "git archive" mistakenly complained twice about a missing executable, + which has been corrected. + source: <c51b72e5-1c32-65e4-6faa-04693b623e2e@web.de> - 'git branch -d' is taught to ignore failures to resolve HEAD when - detached. - Expecting a reroll. - source: <c68f4b140f2495a35c5f30bec4e2e56c246160f4.1667334672.git.me@ttaylorr.com> +* rs/no-more-run-command-v (2022-10-30) 12 commits + (merged to 'next' on 2022-11-03 at 27eb80811c) + + replace and remove run_command_v_opt() + + replace and remove run_command_v_opt_cd_env_tr2() + + replace and remove run_command_v_opt_tr2() + + replace and remove run_command_v_opt_cd_env() + + use child_process members "args" and "env" directly + + use child_process member "args" instead of string array variable + + sequencer: simplify building argument list in do_exec() + + bisect--helper: factor out do_bisect_run() + + bisect: simplify building "checkout" argument list + + am: simplify building "show" argument list + + run-command: fix return value comment + + merge: remove always-the-same "verbose" arguments + Simplify the run-command API. + source: <ea061164-b36b-485c-963f-8c13e813a47e@web.de> -* tb/howto-maintain-git-fixes (2022-10-31) 2 commits - - Documentation: build redo-seen.sh from jch..seen - - Documentation: build redo-jch.sh from master..jch - (this branch uses tb/howto-using-redo-script.) - A pair of bugfixes to the Documentation/howto/maintain-git.txt guide. +* tb/howto-using-redo-script (2022-10-26) 1 commit + (merged to 'next' on 2022-11-03 at 521600fd56) + + Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation + (this branch is used by tb/howto-maintain-git-fixes.) + + Doc update. + source: <4ba057094ae6b1bd5c18583f23f7f99232034c72.1666815325.git.me@ttaylorr.com> + +-------------------------------------------------- +[New Topics] + +* ab/rev-info-init (2022-11-08) 1 commit + (merged to 'next' on 2022-11-08 at 909ad9ed3a) + + revisions API: extend the nascent REV_INFO_INIT macro + + Progress on being able to initialize a rev_info struct with a macro. + + Will merge to 'master'. + source: <patch-1.1-c3afcd69ddb-20221108T140134Z-avarab@gmail.com> + + +* ab/various-leak-fixes (2022-11-08) 16 commits + - built-ins: use free() not UNLEAK() if trivial, rm dead code + - revert: fix parse_options_concat() leak + - cherry-pick: free "struct replay_opts" members + - rebase: don't leak on "--abort" + - connected.c: free the "struct packed_git" + - sequencer.c: fix "opts->strategy" leak in read_strategy_opts() + - ls-files: fix a --with-tree memory leak + - revision API: call graph_clear() in release_revisions() + - unpack-file: fix ancient leak in create_temp_file() + - built-ins & libs & helpers: add/move destructors, fix leaks + - dir.c: free "ident" and "exclude_per_dir" in "struct untracked_cache" + - read-cache.c: clear and free "sparse_checkout_patterns" + - commit: discard partial cache before (re-)reading it + - {reset,merge}: call discard_index() before returning + - tests: mark tests as passing with SANITIZE=leak + - Merge branch 'pw/rebase-no-reflog-action' into ab/various-leak-fixes + (this branch uses pw/rebase-no-reflog-action.) + + Various leak fixes. Will merge to 'next'. - source: <cover.1667260044.git.me@ttaylorr.com> + source: <cover-v2-00.15-00000000000-20221108T172650Z-avarab@gmail.com> -* tl/pack-bitmap-absolute-paths (2022-11-02) 1 commit - - pack-bitmap.c: avoid exposing absolute paths +* aw/complete-case-insensitive (2022-11-07) 2 commits + - completion: add case-insensitive match of pseudorefs + - completion: add optional ignore-case when matching refs + + Introduce a case insensitive mode to the Bash completion helpers. + + Waiting for review. + source: <pull.1374.git.git.1667669315.gitgitgadget@gmail.com> + + +* dd/bisect-helper-subcommand (2022-11-05) 3 commits + (merged to 'next' on 2022-11-08 at 3951bf0f12) + + bisect--helper: parse subcommand with OPT_SUBCOMMAND + + bisect--helper: move all subcommands into their own functions + + bisect--helper: remove unused options + (this branch is used by dd/git-bisect-builtin.) + + Fix a regression in the bisect-helper which mistakenly treats + arguments to the command given to 'git bisect run' as arguments to + the helper. + + Will cook in 'next'. + source: <cover.1667667058.git.congdanhqx@gmail.com> + + +* dd/git-bisect-builtin (2022-11-07) 14 commits + - Turn `git bisect` into a full built-in + - bisect--helper: log: allow arbitrary number of arguments + - bisect--helper: remove subcommand state + - bisect--helper: make `state` optional + - bisect--helper: emit usage for "git bisect" + - bisect test: test exit codes on bad usage + - bisect--helper: pretend we're real bisect when report error + - bisect--helper: remove unused arguments from do_bisect_run + - bisect run: keep some of the post-v2.30.0 output + - bisect: fix output regressions in v2.30.0 + - bisect--helper: pass arg[cv] down to do_bisect_run + - bisect: refactor bisect_run() to match CodingGuidelines + - bisect tests: test for v2.30.0 "bisect run" regressions + - Merge branch 'dd/bisect-helper-subcommand' into dd/git-bisect-builtin + (this branch uses dd/bisect-helper-subcommand.) + + Expecting a (combined) reroll??? + source: <cover-00.13-00000000000-20221104T132117Z-avarab@gmail.com> + +* ds/packed-refs-v2 (2022-11-07) 30 commits + - refs: skip hashing when writing packed-refs v2 + - p1401: create performance test for ref operations + - ci: run GIT_TEST_PACKED_REFS_VERSION=2 in some builds + - t*: skip packed-refs v2 over http tests + - t3210: require packed-refs v1 for some tests + - t5502: add PACKED_REFS_V1 prerequisite + - t5312: allow packed-refs v2 format + - t1409: test with packed-refs v2 + - packed-backend: create GIT_TEST_PACKED_REFS_VERSION + - packed-refs: write prefix chunks + - packed-refs: read optional prefix chunks + - packed-refs: read file format v2 + - packed-refs: write file format version 2 + - packed-backend: create shell of v2 writes + - config: add config values for packed-refs v2 + - packed-backend: create abstraction for writing refs + - packed-backend: extract iterator/updates merge + - packed-backend: extract add_write_error() + - refs: extract packfile format to new file + - chunk-format: parse trailing table of contents + - chunk-format: allow trailing table of contents + - chunk-format: store chunk offset during write + - chunk-format: document trailing table of contents + - chunk-format: number of chunks is optional + - refs: allow loose files without packed-refs + - repository: wire ref extensions to ref backends + - config: fix multi-level bulleted list + - extensions: add refFormat extension + - read-cache: add index.computeHash config option + - hashfile: allow skipping the hash function + + Waiting for review. + source: <pull.1408.git.1667846164.gitgitgadget@gmail.com> + + +* es/chainlint-output (2022-11-08) 4 commits + - chainlint: annotate original test definition rather than token stream + - chainlint: latch start/end position of each token + - chainlint: tighten accuracy when consuming input stream + - chainlint: add explanatory comments + + Teach chainlint.pl to annotate the original test definition instead + of the token stream. + + Will merge to 'next'? + source: <pull.1375.git.git.1667934510.gitgitgadget@gmail.com> + + +* ja/worktree-orphan (2022-11-04) 2 commits + - worktree add: add --orphan flag + - worktree add: Include -B in usage docs + + 'git worktree add' learned how to create a worktree based on an + orphaned branch with `--orphan`. + + source: <20221104213401.17393-1-jacobabel@nullpo.dev> - The pack-bitmap machinery is taught to log the paths of redundant - bitmap(s) to trace2 instead of stderr. + +* js/ci-set-output (2022-11-08) 1 commit + (merged to 'next' on 2022-11-08 at 553062428c) + + ci: use a newer `github-script` version + + Update the actions/github-script dependency in CI to avoid a + deprecation warning. + + Will merge to 'master'. + source: <pull.1387.git.1667902408921.gitgitgadget@gmail.com> + + +* js/remove-stale-scalar-repos (2022-11-07) 1 commit + (merged to 'next' on 2022-11-08 at 6d598a3b80) + + scalar reconfigure -a: remove stale `scalar.repo` entries + + 'scalar reconfigure -a' is taught to automatically remove + scalar.repo entires which no longer exist. + + Will cook in 'next'. + source: <pull.1407.git.1667845501422.gitgitgadget@gmail.com> + + +* jt/submodule-on-demand (2022-11-07) 1 commit + - submodule: explicitly specify on-demand upon push + + Push all submodules recursively with + '--recurse-submodules=on-demand'. + + Waiting for review. + source: <20221108002553.3836987-1-jonathantanmy@google.com> + + +* pw/rebase-no-reflog-action (2022-11-04) 2 commits + - rebase: stop exporting GIT_REFLOG_ACTION + - sequencer: stop exporting GIT_REFLOG_ACTION + (this branch is used by ab/various-leak-fixes.) + + Avoid setting GIT_REFLOG_ACTION to improve readability of the + sequencer internals. + + Expecting a (final?) reroll. + source: <pull.1405.git.1667575142.gitgitgadget@gmail.com> + + +* rp/maintenance-qol (2022-11-08) 2 commits + (merged to 'next' on 2022-11-08 at 076428c430) + + maintenance: add option to register in a specific config + + for-each-repo: interpolate repo path arguments + + 'git maintenance register' is taught to write configuration to an + arbitrary path, and 'git for-each-repo' is taught to expand tilde + characters in paths. + + Will cook in 'next'. + source: <20221108194930.25805-1-ronan@rjp.ie> + + +* sa/cat-file-mailmap--batch-check (2022-10-30) 2 commits + - cat-file: add mailmap support to --batch-check option + - cat-file: add mailmap support to -s option + + 'cat-file' gains mailmap support for its '--batch-check' and '-s' + options. + +* sz/macos-fsmonitor-symlinks (2022-11-08) 1 commit + - fsmonitor--daemon: on macOS support symlink + + Fix an issue where core.fsmonitor on macOS would not notice created + or modified symbolic links. + + Waiting for review. + source: <pull.1406.git.1667885119570.gitgitgadget@gmail.com> + + +* tb/ci-concurrency (2022-11-08) 1 commit + - ci: avoid unnecessary builds + + Avoid unnecessary builds in CI, with settings configured in + ci-config. + + Waiting for review. + source: <ff172f1de982f6f79b598e4ac6d5b2964ca4a098.1667931937.git.me@ttaylorr.com> + + +* tl/notes--blankline (2022-11-07) 3 commits + - notes.c: drop unreachable code in "append_edit()" + - notes.c: fixed tip when target and append note are both empty + - notes.c: introduce "--blank-line" option + + 'git notes append' was taught '--[no-]blank-line' to conditionally + add a LF between a new and existing note. Expecting a reroll. - source: <87a494e5ac0cc992689944ab13600d097c51e54a.1667393419.git.dyroneteng@gmail.com> + source: <cover.1667828335.git.dyroneteng@gmail.com> + + +* vd/update-refs-delete (2022-11-07) 1 commit + (merged to 'next' on 2022-11-08 at 2866156953) + + rebase --update-refs: avoid unintended ref deletion + + Will cook in 'next'. + source: <20221107174752.91186-1-vdye@github.com> -------------------------------------------------- [Stalled] -* cw/submodule-status-in-parallel (2022-10-20) 7 commits - . diff-lib: parallelize run_diff_files for submodules - . diff-lib: refactor match_stat_with_submodule - . submodule: move status parsing into function - . submodule: strbuf variable rename - . run-command: add hide_output to run_processes_parallel_opts - . run-command: add pipe_output_fn to run_processes_parallel_opts - . Merge branch 'ab/run-hook-api-cleanup' into cw/submodule-status-in-parallel +* cw/submodule-status-in-parallel (2022-11-08) 6 commits + - diff-lib: parallelize run_diff_files for submodules + - diff-lib: refactor match_stat_with_submodule + - submodule: move status parsing into function + - submodule: strbuf variable rename + - run-command: add duplicate_output_fn to run_processes_parallel_opts + - Merge branch 'ab/run-hook-api-cleanup' into cw/submodule-status-in-parallel Allow the internal "diff-files" engine to run "how has this submodule changed?" in parallel to speed up "git status". - Breaks winVS test? - cf. <https://github.com/git/git/actions/runs/3298596454/jobs/5441029092> - source: <20221011232604.839941-1-calvinwan@google.com> + Waiting for review. + source: <20221020232532.1128326-1-calvinwan@google.com> * js/bisect-in-c (2022-08-30) 17 commits @@ -275,24 +510,104 @@ for convenience (replace "htmldocs" with "manpages" for the manual -------------------------------------------------- [Cooking] -* ab/cmake-nix-and-ci (2022-11-02) 12 commits - - CI: add a "linux-cmake-test" to run cmake & ctest on linux - - cmake: copy over git-p4.py for t983[56] perforce test - - cmake: support GIT_TEST_OPTS, abstract away WIN32 defaults - - Makefile + cmake: use environment, not GIT-BUILD-DIR - - test-lib.sh: support a "GIT_TEST_BUILD_DIR" - - cmake: set "USE_LIBPCRE2" in "GIT-BUILD-OPTIONS" for test-lib.sh - - cmake & test-lib.sh: add a $GIT_SOURCE_DIR variable - - cmake: chmod +x the bin-wrappers/* & SCRIPT_{SH,PERL} & git-p4 - - cmake: don't copy chainlint.pl to build directory - - cmake: update instructions for portable CMakeLists.txt - - cmake: don't "mkdir -p" and "cd" in build instructions - - cmake: increase test timeout on Windows only +* ab/submodule-helper-prep-only (2022-11-08) 9 commits + (merged to 'next' on 2022-11-08 at c0c4f4d1c3) + + submodule--helper: use OPT_SUBCOMMAND() API + + submodule--helper: drop "update --prefix <pfx>" for "-C <pfx> update" + + submodule--helper: remove --prefix from "absorbgitdirs" + + submodule API & "absorbgitdirs": remove "----recursive" option + + submodule.c: refactor recursive block out of absorb function + + submodule tests: test for a "foreach" blind-spot + + submodule--helper: fix a memory leak in "status" + + submodule tests: add tests for top-level flag output + + submodule--helper: move "config" to a test-tool - Fix assorted issues with CTest on *nix machines. + Preparation to remove git-submodule.sh and replace it with a builtin. + + Will cook in 'next'. + source: <cover-v2-0.9-00000000000-20221108T140501Z-avarab@gmail.com> + + +* ds/bundle-uri-4 (2022-10-31) 9 commits + - clone: unbundle the advertised bundles + - bundle-uri: download bundles from an advertised list + - bundle-uri: allow relative URLs in bundle lists + - strbuf: reintroduce strbuf_parent_directory() + - bundle-uri client: add boolean transfer.bundleURI setting + - bundle-uri: serve bundle.* keys from config + - bundle-uri client: add helper for testing server + - bundle-uri client: add minimal NOOP client + - protocol v2: add server-side "bundle-uri" skeleton + + Bundle URIs part 4. Waiting for review. - source: <cover-v3-00.12-00000000000-20221101T225022Z-avarab@gmail.com> + source: <pull.1400.git.1667264854.gitgitgadget@gmail.com> + + +* sg/plug-line-log-leaks (2022-11-02) 3 commits + - diff.c: use diff_free_queue() + - line-log: free the diff queues' arrays when processing merge commits + - line-log: free diff queue when processing non-merge commits + + A handful of leaks in the line-log machinery have been plugged. + + Expecting a reroll. + source: <20221102220142.574890-1-szeder.dev@gmail.com> + + +* tb/branch-delete-detached (2022-11-01) 1 commit + - branch: gracefully handle '-d' on detached HEAD + + 'git branch -d' is taught to ignore failures to resolve HEAD when + detached. + + Expecting a reroll. + source: <c68f4b140f2495a35c5f30bec4e2e56c246160f4.1667334672.git.me@ttaylorr.com> + + +* tb/howto-maintain-git-fixes (2022-10-31) 2 commits + - Documentation: build redo-seen.sh from jch..seen + - Documentation: build redo-jch.sh from master..jch + + A pair of bugfixes to the Documentation/howto/maintain-git.txt guide. + + Will merge to 'next'. + source: <cover.1667260044.git.me@ttaylorr.com> + + +* tl/pack-bitmap-absolute-paths (2022-11-04) 2 commits + - pack-bitmap.c: remove unnecessary "open_pack_index()" calls + - pack-bitmap.c: avoid exposing absolute paths + + The pack-bitmap machinery is taught to log the paths of redundant + bitmap(s) to trace2 instead of stderr. + + Expecting a (final?) reroll. + source: <cover.1667470481.git.dyroneteng@gmail.com> + + +* ab/cmake-nix-and-ci (2022-11-04) 14 commits + (merged to 'next' on 2022-11-08 at 6ef4e93b36) + + CI: add a "linux-cmake-test" to run cmake & ctest on linux + + cmake: copy over git-p4.py for t983[56] perforce test + + cmake: only look for "sh" in "C:/Program Files" on Windows + + cmake: increase test timeout on Windows only + + cmake: support GIT_TEST_OPTS, abstract away WIN32 defaults + + Makefile + cmake: use environment, not GIT-BUILD-DIR + + test-lib.sh: support a "GIT_TEST_BUILD_DIR" + + cmake: set "USE_LIBPCRE2" in "GIT-BUILD-OPTIONS" for test-lib.sh + + cmake & test-lib.sh: add a $GIT_SOURCE_DIR variable + + cmake: chmod +x the bin-wrappers/* & SCRIPT_{SH,PERL} & git-p4 + + cmake: don't copy chainlint.pl to build directory + + cmake: update instructions for portable CMakeLists.txt + + cmake: use "-S" and "-B" to specify source and build directories + + cmake: don't invoke msgfmt with --statistics + + Fix assorted issues with CTest on *nix machines. + + Will cook in 'next'. + source: <cover-v4-00.14-00000000000-20221103T160255Z-avarab@gmail.com> * ab/make-bin-wrappers (2022-10-31) 4 commits @@ -320,32 +635,34 @@ for convenience (replace "htmldocs" with "manpages" for the manual source: <cover-0.3-00000000000-20221029T025520Z-avarab@gmail.com> -* do/modernize-t7001 (2022-10-31) 1 commit - - t7001-mv.sh:modernizing test script using function +* do/modernize-t7001 (2022-11-04) 1 commit + (merged to 'next' on 2022-11-08 at dfc9c80e73) + + t7001-mv.sh: modernizing test script using functions Modernize test script to avoid "test -f" and friends. - Will merge to 'next'. - source: <pull.1372.git.git.1667150441883.gitgitgadget@gmail.com> + Will merge to 'master'. + source: <pull.1372.v3.git.git.1667574352244.gitgitgadget@gmail.com> -* kz/merge-tree-merge-base (2022-11-01) 2 commits - - merge-tree.c: support --merge-base in conjunction with --stdin +* kz/merge-tree-merge-base (2022-11-04) 2 commits + - merge-tree.c: allow specifying the merge-base when --stdin is passed - merge-tree.c: add --merge-base=<commit> option "merge-tree" learns a new `--merge-base` option. Waiting for review. - source: <pull.1397.v4.git.1667292904.gitgitgadget@gmail.com> + source: <pull.1397.v6.git.1667472621.gitgitgadget@gmail.com> -* mh/password-can-be-pat (2022-11-02) 1 commit - - Mention that password could be a personal access token. +* mh/password-can-be-pat (2022-11-08) 1 commit + (merged to 'next' on 2022-11-08 at 3135ade2a6) + + Documentation/gitcredentials.txt: mention password alternatives Documentation update to git-credential(1). - Will merge to 'next'. - source: <pull.1396.v2.git.1667385022103.gitgitgadget@gmail.com> + Will merge to 'master'. + source: <pull.1396.v3.git.1667912487608.gitgitgadget@gmail.com> * po/pretty-hard-trunc (2022-11-02) 1 commit @@ -357,25 +674,14 @@ for convenience (replace "htmldocs" with "manpages" for the manual source: <20221102120853.2013-1-philipoakley@iee.email> -* rr/long-status-advice (2022-10-31) 1 commit +* rr/long-status-advice (2022-11-04) 1 commit - status: long status advice adapted to recent capabilities The advice message emitted by a slow "status" run is amended to mention fsmonitor. Waiting for reviewer feedback on the updated round. - source: <pull.1384.v2.git.1667002005494.gitgitgadget@gmail.com> - - -* rs/archive-filter-error-once (2022-10-30) 1 commit - (merged to 'next' on 2022-11-03 at c2d1004d96) - + archive-tar: report filter start error only once - - "git archive" mistakenly complained twice about a missing executable, - which has been corrected. - - Will merge to 'master'. - source: <c51b72e5-1c32-65e4-6faa-04693b623e2e@web.de> + source: <pull.1384.v3.git.1667424467505.gitgitgadget@gmail.com> * ab/config-multi-and-nonbool (2022-11-02) 9 commits @@ -396,60 +702,33 @@ for convenience (replace "htmldocs" with "manpages" for the manual source: <cover-v2-0.9-00000000000-20221101T225822Z-avarab@gmail.com> -* ab/sha-makefile-doc (2022-10-26) 9 commits - - Makefile: discuss SHAttered in *_SHA{1,256} discussion - - Makefile: document default SHA-1 backend on OSX - - Makefile: document SHA-1 and SHA-256 default and selection order - - Makefile: document default SHA-256 backend - - Makefile: rephrase the discussion of *_SHA1 knobs - - Makefile: create and use sections for "define" flag listing - - Makefile: correct DC_SHA1 documentation - - INSTALL: remove discussion of SHA-1 backends - - Makefile: always (re)set DC_SHA1 on fallback +* ab/sha-makefile-doc (2022-11-07) 10 commits + (merged to 'next' on 2022-11-08 at 6d3068d7cd) + + Makefile: discuss SHAttered in *_SHA{1,256} discussion + + Makefile: document default SHA-1 backend on OSX + + Makefile & test-tool: replace "DC_SHA1" variable with a "define" + + Makefile: document SHA-1 and SHA-256 default and selection order + + Makefile: document default SHA-256 backend + + Makefile: rephrase the discussion of *_SHA1 knobs + + Makefile: create and use sections for "define" flag listing + + Makefile: correct DC_SHA1 documentation + + INSTALL: remove discussion of SHA-1 backends + + Makefile: always (re)set DC_SHA1 on fallback Makefile comments updates and reordering to clarify knobs used to choose SHA implementations. - Will merge to 'next'? - source: <cover-v4-0.9-00000000000-20221026T145255Z-avarab@gmail.com> + Will cook in 'next'. + source: <cover-v5-00.10-00000000000-20221107T211736Z-avarab@gmail.com> -* rs/no-more-run-command-v (2022-10-30) 12 commits - (merged to 'next' on 2022-11-03 at 27eb80811c) - + replace and remove run_command_v_opt() - + replace and remove run_command_v_opt_cd_env_tr2() - + replace and remove run_command_v_opt_tr2() - + replace and remove run_command_v_opt_cd_env() - + use child_process members "args" and "env" directly - + use child_process member "args" instead of string array variable - + sequencer: simplify building argument list in do_exec() - + bisect--helper: factor out do_bisect_run() - + bisect: simplify building "checkout" argument list - + am: simplify building "show" argument list - + run-command: fix return value comment - + merge: remove always-the-same "verbose" arguments - - Simplify the run-command API. - - Will merge to 'master'. - source: <ea061164-b36b-485c-963f-8c13e813a47e@web.de> - - -* tb/howto-using-redo-script (2022-10-26) 1 commit - (merged to 'next' on 2022-11-03 at 521600fd56) - + Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation - (this branch is used by tb/howto-maintain-git-fixes.) - - Doc update. - - Will merge to 'master'. - source: <4ba057094ae6b1bd5c18583f23f7f99232034c72.1666815325.git.me@ttaylorr.com> - - -* ps/receive-use-only-advertised (2022-10-28) 3 commits - - SQUASH - leakfix - - receive-pack: use advertised reference tips to inform connectivity check - - connected: allow supplying different view of reachable objects +* ps/receive-use-only-advertised (2022-11-08) 6 commits + - receive-pack: only use visible refs for connectivity check + - rev-parse: add `--exclude-hidden=` option + - revision: add new parameter to exclude hidden refs + - revision: introduce struct to handle exclusions + - revision: move together exclusion-related functions + - refs: get rid of global list of hidden refs "git receive-pack" used to use all the local refs as the boundary for checking connectivity of the data "git push" sent, but now it @@ -459,21 +738,10 @@ for convenience (replace "htmldocs" with "manpages" for the manual prove they have all objects that are necessary to complete the history on top of only the history available to them. - Expecting a reroll. + Expecting a (final?) reroll. cf. <221028.86bkpw805n.gmgdl@evledraar.gmail.com> cf. <xmqqr0yrizqm.fsf@gitster.g> - source: <cover.1666967670.git.ps@pks.im> - - -* jc/set-gid-bit-less-aggressively (2022-10-28) 1 commit - (merged to 'next' on 2022-11-03 at 32bfd99ffd) - + adjust_shared_perm(): leave g+s alone when the group does not matter - - The adjust_shared_perm() helper function learned to refrain from - setting the "g+s" bit on directories when it is not necessary. - - Will merge to 'master'. - source: <xmqqr0yrhco6.fsf@gitster.g> + source: <cover.1667901510.git.ps@pks.im> * gc/submodule-clone-update-with-branches (2022-10-30) 8 commits @@ -493,18 +761,6 @@ for convenience (replace "htmldocs" with "manpages" for the manual source: <pull.1321.v3.git.git.1666988096.gitgitgadget@gmail.com> -* es/mark-gc-cruft-as-experimental (2022-10-26) 2 commits - (merged to 'next' on 2022-11-03 at 4079e1b06b) - + config: let feature.experimental imply gc.cruftPacks=true - + gc: add tests for --cruft and friends - - Enable gc.cruftpacks by default for those who opt into - feature.experimental setting. - - Will merge to 'master'. - source: <cover.1666819953.git.me@ttaylorr.com> - - * pw/config-int-parse-fixes (2022-10-22) 3 commits . git_parse_signed(): avoid integer overflow . config: require at least one digit when parsing numbers @@ -527,21 +783,22 @@ for convenience (replace "htmldocs" with "manpages" for the manual * tb/repack-expire-to (2022-10-24) 4 commits - . builtin/repack.c: implement `--expire-to` for storing pruned objects - . builtin/repack.c: write cruft packs to arbitrary locations - . builtin/repack.c: pass "cruft_expiration" to `write_cruft_pack` - . builtin/repack.c: pass "out" to `prepare_pack_objects` + (merged to 'next' on 2022-11-08 at 496ce3c62d) + + builtin/repack.c: implement `--expire-to` for storing pruned objects + + builtin/repack.c: write cruft packs to arbitrary locations + + builtin/repack.c: pass "cruft_expiration" to `write_cruft_pack` + + builtin/repack.c: pass "out" to `prepare_pack_objects` "git repack" learns to send cruft objects out of the way into packfiles outside the repository. - Waiting for review. + Will cook in 'next'. source: <cover.1666636974.git.me@ttaylorr.com> * cc/filtered-repack (2022-10-25) 2 commits - . repack: add --filter=<filter-spec> option - . pack-objects: allow --filter without --stdout + - repack: add --filter=<filter-spec> option + - pack-objects: allow --filter without --stdout "git repack" learns to discard objects that ought to be retrievable again from the promissor remote. @@ -550,29 +807,16 @@ for convenience (replace "htmldocs" with "manpages" for the manual source: <20221025122856.20204-1-christian.couder@gmail.com> -* al/trace2-clearing-skip-worktree (2022-10-31) 2 commits - - SQUASH??? - - index: add trace2 region for clear skip worktree +* al/trace2-clearing-skip-worktree (2022-11-04) 2 commits + (merged to 'next' on 2022-11-08 at 567aeb8d83) + + index: raise a bug if the index is materialised more than once + + index: add trace2 region for clear skip worktree Add trace2 counters to the region to clear skip worktree bits in a sparse checkout. - Expecting a reroll? - source: <pull.1368.v3.git.git.1667177791591.gitgitgadget@gmail.com> - - -* po/glossary-around-traversal (2022-10-30) 4 commits - (merged to 'next' on 2022-11-03 at 58b659f92b) - + glossary: add reachability bitmap description - + glossary: add "commit graph" description - + doc: use 'object database' not ODB or abbreviation - + doc: use "commit-graph" hyphenation consistently - - The glossary entries for "commit-graph file" and "reachability - bitmap" have been added. - Will merge to 'master'. - source: <20221029164112.2097-1-philipoakley@iee.email> + source: <pull.1368.v4.git.git.1667516701.gitgitgadget@gmail.com> * mc/credential-helper-auth-headers (2022-11-02) 11 commits @@ -617,13 +861,14 @@ for convenience (replace "htmldocs" with "manpages" for the manual source: <pull.1359.v3.git.git.1665973401.gitgitgadget@gmail.com> -* en/sparse-checkout-design (2022-10-08) 1 commit - . sparse-checkout.txt: new document with sparse-checkout directions +* en/sparse-checkout-design (2022-11-07) 1 commit + (merged to 'next' on 2022-11-08 at 42e164b490) + + sparse-checkout.txt: new document with sparse-checkout directions Design doc. Needs review. - source: <pull.1367.v3.git.1665269538608.gitgitgadget@gmail.com> + source: <pull.1367.v4.git.1667714666810.gitgitgadget@gmail.com> * pw/test-todo (2022-10-06) 3 commits @@ -638,22 +883,23 @@ for convenience (replace "htmldocs" with "manpages" for the manual * ab/coccicheck-incremental (2022-11-02) 13 commits - - spatchcache: add a ccache-alike for "spatch" - - cocci: run against a generated ALL.cocci - - cocci rules: remove <id>'s from rules that don't need them - - Makefile: copy contrib/coccinelle/*.cocci to build/ - - cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES - - cocci: make "coccicheck" rule incremental - - cocci: split off "--all-includes" from SPATCH_FLAGS - - cocci: split off include-less "tests" from SPATCH_FLAGS - - Makefile: split off SPATCH_BATCH_SIZE comment from "cocci" heading - - Makefile: have "coccicheck" re-run if flags change - - Makefile: add ability to TAB-complete cocci *.patch rules - - cocci rules: remove unused "F" metavariable from pending rule - - Makefile + shared.mak: rename and indent $(QUIET_SPATCH_T) + (merged to 'next' on 2022-11-08 at 0f3c55d4c2) + + spatchcache: add a ccache-alike for "spatch" + + cocci: run against a generated ALL.cocci + + cocci rules: remove <id>'s from rules that don't need them + + Makefile: copy contrib/coccinelle/*.cocci to build/ + + cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES + + cocci: make "coccicheck" rule incremental + + cocci: split off "--all-includes" from SPATCH_FLAGS + + cocci: split off include-less "tests" from SPATCH_FLAGS + + Makefile: split off SPATCH_BATCH_SIZE comment from "cocci" heading + + Makefile: have "coccicheck" re-run if flags change + + Makefile: add ability to TAB-complete cocci *.patch rules + + cocci rules: remove unused "F" metavariable from pending rule + + Makefile + shared.mak: rename and indent $(QUIET_SPATCH_T) "make coccicheck" is time consuming. It has been made to run more incrementally. - Will merge to 'next'? + Will cook in 'next'. source: <cover-v5-00.13-00000000000-20221101T222616Z-avarab@gmail.com> |