From: Junio C Hamano Date: Tue, 1 Mar 2022 07:38:36 +0000 (-0800) Subject: What's cooking (2022/02 #08) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a693ca274febe70764491f402b6575e6518348c;p=thirdparty%2Fgit.git What's cooking (2022/02 #08) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 9beab7a6dc..d187a96c16 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 (Feb 2022, #07; Fri, 25) +Subject: What's cooking in git.git (Feb 2022, #08; Mon, 28) X-master-at: 715d08a9e51251ad8290b181b6ac3b9e1f9719d7 -X-next-at: 0bdcbb44647328cb1bdb23be648ecb677189c7b4 +X-next-at: 50a0bfa57956f3f2835aabb9a04449ba66e9469b -What's cooking in git.git (Feb 2022, #07; Fri, 25) +What's cooking in git.git (Feb 2022, #08; Mon, 28) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -47,159 +47,98 @@ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- -[Graduated to 'master'] - -* ab/ambiguous-object-name (2022-01-27) 7 commits - (merged to 'next' on 2022-02-15 at 6028098cfe) - + object-name: re-use "struct strbuf" in show_ambiguous_object() - + object-name: iterate ambiguous objects before showing header - + object-name: show date for ambiguous tag objects - + object-name: make ambiguous object output translatable - + object-name: explicitly handle bad tags in show_ambiguous_object() - + object-name: explicitly handle OBJ_BAD in show_ambiguous_object() - + object-name tests: add tests for ambiguous object blind spots - - Error output given in response to an ambiguous object name has been - improved. - source: - - -* ab/date-mode-release (2022-02-16) 5 commits - (merged to 'next' on 2022-02-17 at 62f1cf68ae) - + date API: add and use a date_mode_release() - + date API: add basic API docs - + date API: provide and use a DATE_MODE_INIT - + date API: create a date.h, split from cache.h - + cache.h: remove always unused show_date_human() declaration - - Plug (some) memory leaks around parse_date_format(). - source: - - -* ab/diff-free-more (2022-02-16) 2 commits - (merged to 'next' on 2022-02-17 at be8ae78a2d) - + diff.[ch]: have diff_free() free options->parseopts - + diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec) - - Leakfixes. - source: - - -* ab/grep-patterntype (2022-02-15) 10 commits - (merged to 'next' on 2022-02-16 at 64222759a2) - + grep: simplify config parsing and option parsing - + grep.c: do "if (bool && memchr())" not "if (memchr() && bool)" - + grep.h: make "grep_opt.pattern_type_option" use its enum - + grep API: call grep_config() after grep_init() - + grep.c: don't pass along NULL callback value - + built-ins: trust the "prefix" from run_builtin() - + grep tests: add missing "grep.patternType" config tests - + grep tests: create a helper function for "BRE" or "ERE" - + log tests: check if grep_config() is called by "log"-like cmds - + grep.h: remove unused "regex_t regexp" from grep_opt - - Some code clean-up in the "git grep" machinery. - source: - - -* ab/only-single-progress-at-once (2022-02-03) 9 commits - (merged to 'next' on 2022-02-15 at 97ac92e662) - + pack-bitmap-write.c: don't return without stop_progress() - + progress API: unify stop_progress{,_msg}(), fix trace2 bug - + progress.c: refactor stop_progress{,_msg}() to use helpers - + progress.c: use dereferenced "progress" variable, not "(*p_progress)" - + progress.h: format and be consistent with progress.c naming - + progress.c tests: test some invalid usage - + progress.c tests: make start/stop commands on stdin - + progress.c test helper: add missing braces - + leak tests: fix a memory leak in "test-progress" helper - - Further tweaks on progress API. - source: - - -* ds/core-untracked-cache-config (2022-02-17) 1 commit - (merged to 'next' on 2022-02-18 at 0c426fdec1) - + dir: force untracked cache with core.untrackedCache - - Setting core.untrackedCache to true failed to add the untracked - cache extension to the index. - source: +[New Topics] +* js/ci-github-workflow-markup (2022-02-25) 9 commits + - ci: call `finalize_test_case_output` a little later + - ci: use `--github-workflow-markup` in the GitHub workflow + - ci: optionally mark up output in the GitHub workflow + - test(junit): avoid line feeds in XML attributes + - tests: refactor --write-junit-xml code + - ci/run-build-and-tests: add some structure to the GitHub workflow output + - ci: make it easier to find failed tests' logs in the GitHub workflow + - ci/run-build-and-tests: take a more high-level view + - ci: fix code style -* ds/sparse-checkout-requires-per-worktree-config (2022-02-08) 6 commits - (merged to 'next' on 2022-02-15 at f86bec6da9) - + config: make git_configset_get_string_tmp() private - + worktree: copy sparse-checkout patterns and config on add - + sparse-checkout: set worktree-config correctly - + config: add repo_config_set_worktree_gently() - + worktree: create init_worktree_config() - + Documentation: add extensions.worktreeConfig details - (this branch is used by ds/worktree-docs.) + Update the GitHub workflow support to make it quicker to get to the + failing test. - "git sparse-checkout" wants to work with per-worktree configuration, - but did not work well in a worktree attached to a bare repository. - source: + Will merge to 'next'? + source: -* en/ort-inner-merge-conflict-report (2022-02-17) 1 commit - (merged to 'next' on 2022-02-18 at 367dd32e74) - + merge-ort: make informational messages from recursive merges clearer +* jc/merge-continue-doc (2022-02-28) 1 commit + - merge: 'git merge --continue' is merely 'git commit' - Messages "ort" merge backend prepares while dealing with conflicted - paths were unnecessarily confusing since it did not differentiate - inner merges and outer merges. - source: + "git merge" documentation clarifies that "git commit" is sufficient + to conclude an interrupted merge. + source: -* ja/i18n-common-messages (2022-02-04) 4 commits - (merged to 'next' on 2022-02-15 at 23d56641fc) - + i18n: fix some misformated placeholders in command synopsis - + i18n: remove from i18n strings that do not hold translatable parts - + i18n: factorize "invalid value" messages - + i18n: factorize more 'incompatible options' messages +* jk/name-rev-w-genno (2022-02-28) 1 commit + . name-rev: use generation numbers if available - Unify more messages to help l10n. - source: + "git name-rev" learned to use the generation numbers when setting + the lower bound of searching commits used to explain the revision, + when available, instead of committer time. + Will merge to 'next'? + source: <20220228215025.325904-2-jacob.e.keller@intel.com> -* jc/name-rev-stdin (2022-02-15) 1 commit - (merged to 'next' on 2022-02-16 at ee993590a4) - + name-rev: replace --stdin with --annotate-stdin in synopsis +-------------------------------------------------- +[Stalled] - Finishing touches to an earlier "name-rev --annotate-stdin" series. - source: +* tl/ls-tree-oid-only (2022-02-08) 13 commits + - ls-tree.c: support --object-only option for "git-ls-tree" + - ls-tree: introduce function "fast_path()" + - ls-tree.c: introduce "--format" option + - cocci: allow padding with `strbuf_addf()` + - ls-tree: introduce struct "show_tree_data" + - ls-tree: slightly refactor `show_tree()` + - ls-tree: fix "--name-only" and "--long" combined use bug + - ls-tree: simplify nesting if/else logic in "show_tree()" + - ls-tree: rename "retval" to "recurse" in "show_tree()" + - ls-tree: use "size_t", not "int" for "struct strbuf"'s "len" + - ls-tree: use "enum object_type", not {blob,tree,commit}_type + - ls-tree: add missing braces to "else" arms + - ls-tree: remove commented-out code + "git ls-tree" learns "--oid-only" option, similar to "--name-only", + and more generalized "--format" option. + source: -* js/apply-partial-clone-filters-recursively (2022-02-09) 1 commit - (merged to 'next' on 2022-02-16 at 4b3852bd52) - + clone, submodule: pass partial clone filters to submodules - "git clone --filter=... --recurse-submodules" only makes the - top-level a partial clone, while submodules are fully cloned. This - behaviour is changed to pass the same filter down to the submodules. - source: <690d2316ad518ea4551821b2b3aa652996858475.1644034886.git.steadmon@google.com> +* je/http-better-error-output (2021-12-03) 1 commit + . http-backend: give a hint that web browser access is not supported + When the http-backend program, which is the server-side component + for the smart HTTP transport, sends a "404 Not found" error, we + deliberately did not say anything to the requesting client. We now + send a message back to the browser to tell the user that they do + not want to visit the URL via their browser, instead of a totally + blank page. -* rs/pcre-invalid-utf8-fix-fix (2022-02-17) 1 commit - (merged to 'next' on 2022-02-18 at 9e47d58bda) - + grep: fix triggering PCRE2_NO_START_OPTIMIZE workaround + Expecting a reroll. + Breaks its self tests. + cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@vanv.qr> + source: <20211202102855.23907-1-jengelh@inai.de> - Workaround we have for versions of PCRE2 before their version 10.36 - were in effect only for their versions newer than 10.36 by mistake, - which has been corrected. - source: <4e391e2e-6561-3c2e-0306-c860a37356bc@web.de> +* cb/save-term-across-editor-invocation (2021-12-01) 3 commits + - fixup! editor: allow for saving/restoring terminal state + - editor: allow for saving/restoring terminal state + - terminal: teach save_term to fail when not foreground -* tb/coc-plc-update (2022-02-18) 1 commit - (merged to 'next' on 2022-02-23 at 9d45e42c9a) - + CODE_OF_CONDUCT.md: update PLC members list + Some editors are reported to leave the terminal in funny state + after they exit on Windows. Work it around by saving and restoring + the terminal state when needed. - Document Taylor as a new member of Git PLC at SFC. Welcome. - source: + Expecting a reroll. + cf. + source: <20211202035446.1154-1-carenas@gmail.com> -------------------------------------------------- -[New Topics] +[Cooking] * et/xdiff-indirection (2022-02-17) 1 commit - xdiff: provide indirection to git functions @@ -213,15 +152,18 @@ Release tarballs are available at: * jt/ls-files-stage-recurse (2022-02-23) 1 commit - - ls-files: support --recurse-submodules --stage + (merged to 'next' on 2022-02-28 at 4ad82bfdf6) + + ls-files: support --recurse-submodules --stage Many output modes of "ls-files" does not work with its "--recurse-submodules" option, but the "-s" mode has taught to work with it. + + Will merge to 'master'. source: <20220224002303.2363189-1-jonathantanmy@google.com> -* ab/c99 (2022-02-21) 2 commits +* ab/c99-variadic-macros (2022-02-21) 2 commits - C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code - git-compat-util.h: clarify GCC v.s. C99-specific in comment @@ -234,64 +176,69 @@ Release tarballs are available at: * ab/hook-tests (2022-02-19) 2 commits - - hook tests: use a modern style for "pre-push" tests - - hook tests: test for exact "pre-push" hook input + (merged to 'next' on 2022-02-28 at bb6b7d1c24) + + hook tests: use a modern style for "pre-push" tests + + hook tests: test for exact "pre-push" hook input Test modernization. - Will merge to 'next'. + Will merge to 'master'. source: -* ab/test-lib-tweaks (2022-02-21) 4 commits - - test-lib: add "fast_unwind_on_malloc=0" to LSAN_OPTIONS - - test-lib: make $GIT_BUILD_DIR an absolute path - - test-lib: correct commentary on TEST_DIRECTORY overriding - - test-lib: add GIT_SAN_OPTIONS, inherit [AL]SAN_OPTIONS +* ab/test-leak-diag (2022-02-28) 4 commits + (merged to 'next' on 2022-02-28 at 3019aad7fe) + + test-lib: add "fast_unwind_on_malloc=0" to LSAN_OPTIONS + + test-lib: make $GIT_BUILD_DIR an absolute path + + test-lib: correct and assert TEST_DIRECTORY overriding + + test-lib: add GIT_SAN_OPTIONS, inherit [AL]SAN_OPTIONS Random test-framework clean-up. - Will merge to 'next'? - source: + Will merge to 'master'. + source: * ds/worktree-docs (2022-02-23) 11 commits - - worktree: use 'worktree' over 'working tree' - - worktree: use 'worktree' over 'working tree' - - worktree: use 'worktree' over 'working tree' - - worktree: use 'worktree' over 'working tree' - - worktree: use 'worktree' over 'working tree' - - worktree: use 'worktree' over 'working tree' - - worktree: use 'worktree' over 'working tree' - - worktree: extract checkout_worktree() - - worktree: extract copy_sparse_checkout() - - worktree: extract copy_filtered_worktree_config() - - worktree: combine two translatable messages + (merged to 'next' on 2022-02-28 at b7d23cb1a5) + + worktree: use 'worktree' over 'working tree' + + worktree: use 'worktree' over 'working tree' + + worktree: use 'worktree' over 'working tree' + + worktree: use 'worktree' over 'working tree' + + worktree: use 'worktree' over 'working tree' + + worktree: use 'worktree' over 'working tree' + + worktree: use 'worktree' over 'working tree' + + worktree: extract checkout_worktree() + + worktree: extract copy_sparse_checkout() + + worktree: extract copy_filtered_worktree_config() + + worktree: combine two translatable messages Tighten the language around "working tree" and "worktree" in the docs. - Will merge to 'next'. + Will merge to 'master'. source: * en/merge-ort-plug-leaks (2022-02-20) 2 commits - - merge-ort: fix small memory leak in unique_path() - - merge-ort: fix small memory leak in detect_and_process_renames() + (merged to 'next' on 2022-02-28 at d7afb6b624) + + merge-ort: fix small memory leak in unique_path() + + merge-ort: fix small memory leak in detect_and_process_renames() Leakfix. - Will merge to 'next'. + Will merge to 'master'. source: -* jc/rerere-train-modernise (2022-02-20) 1 commit - - rerere-train: modernise a bit +* jc/rerere-train-modernise (2022-02-27) 1 commit + (merged to 'next' on 2022-02-28 at d86d29733d) + + rerere-train: two fixes to the use of "git show -s" - Small modernisation of the rerere-train script (in contrib/). + Small modernization of the rerere-train script (in contrib/). - Will merge to 'next'. - source: + Will merge to 'master'. + source: <20220227220924.2144325-1-gitster@pobox.com> * ab/help-fixes (2022-02-23) 9 commits @@ -307,28 +254,29 @@ Release tarballs are available at: Updates to how command line options to "git help" are handled. - Will merge to 'next'? + Will merge to 'next'. source: -* ac/usage-string-fixups (2022-02-23) 2 commits - - parse-options.c: add style checks for usage-strings - - amend remaining usage strings according to style guide +* ac/usage-string-fixups (2022-02-23) 1 commit + (merged to 'next' on 2022-02-28 at 5e8fa3f846) + + amend remaining usage strings according to style guide - Usage-string normalization, plus runtime enforcement. + Usage-string normalization. - Will merge to 'next'? - source: + Will merge to 'master'. + source: * mc/index-pack-report-max-size (2022-02-23) 1 commit - - index-pack: clarify the breached limit + (merged to 'next' on 2022-02-28 at 31b907844b) + + index-pack: clarify the breached limit When "index-pack" dies due to incoming data exceeding the maximum allowed input size, include the value of the limit in the error message. - Will merge to 'next'? + Will merge to 'master'. source: @@ -342,20 +290,21 @@ Release tarballs are available at: * ab/c99-designated-initializers (2022-02-24) 9 commits - - fast-import.c: use designated initializers for "partial" struct assignments - - refspec.c: use designated initializers for "struct refspec_item" - - convert.c: use designated initializers for "struct stream_filter*" - - userdiff.c: use designated initializers for "struct userdiff_driver" - - archive-*.c: use designated initializers for "struct archiver" - - object-file: use designated initializers for "struct git_hash_algo" - - trace2: use designated initializers for "struct tr2_dst" - - trace2: use designated initializers for "struct tr2_tgt" - - imap-send.c: use designated initializers for "struct imap_server_conf" + (merged to 'next' on 2022-02-28 at 5ff6d5b26f) + + fast-import.c: use designated initializers for "partial" struct assignments + + refspec.c: use designated initializers for "struct refspec_item" + + convert.c: use designated initializers for "struct stream_filter*" + + userdiff.c: use designated initializers for "struct userdiff_driver" + + archive-*.c: use designated initializers for "struct archiver" + + object-file: use designated initializers for "struct git_hash_algo" + + trace2: use designated initializers for "struct tr2_dst" + + trace2: use designated initializers for "struct tr2_tgt" + + imap-send.c: use designated initializers for "struct imap_server_conf" Use designated initializers we started using in mid 2017 in more parts of the codebase that are relatively quiescent. - Will merge to 'next' and then to 'master'. + Will merge to 'master'. source: @@ -385,31 +334,28 @@ Release tarballs are available at: source: -* ah/advice-switch-requires-detach-to-detach (2022-02-24) 1 commit - - switch: mention the --detach option when dying due to lack of a branch +* ah/advice-switch-requires-detach-to-detach (2022-02-25) 1 commit + (merged to 'next' on 2022-02-28 at 941ee621cf) + + switch: mention the --detach option when dying due to lack of a branch The error message given by "git switch HEAD~4" has been clarified to suggest the "--detach" option that is required. - Will merge to 'next'? - source: <20220224064710.2252637-1-alexhenrie24@gmail.com> + Will merge to 'master'. + source: <20220226061213.1590341-1-alexhenrie24@gmail.com> -* ds/commit-graph-gen-v2-fixes (2022-02-24) 7 commits - - commit-graph: write file format v2 - - commit-graph: parse file format v2 - - commit-graph: document file format v2 +* ds/commit-graph-gen-v2-fixes (2022-02-28) 4 commits - commit-graph: fix generation number v2 overflow values - commit-graph: start parsing generation v2 (again) - commit-graph: fix ordering bug in generation numbers - test-read-graph: include extra post-parse info Fixes to the way generation number v2 in the commit-graph files are - (not) handled, and introduce a newer file format to store the same - information in a way that is more efficient to access. + (not) handled. - Expecting a reroll. - source: + Will merge to 'next'. + source: * ds/partial-bundles (2022-02-24) 11 commits @@ -442,18 +388,20 @@ Release tarballs are available at: added more processes our tests need to kill when cleaning up. Adjustments have been made to accomodate these changes. - Will merge to 'next'. + Expecting a reroll. + cf. source: <20220203123724.47529-1-fs@gigacodes.de> * gc/stash-on-branch-with-multi-level-name (2022-02-24) 1 commit - - stash: strip "refs/heads/" with skip_prefix + (merged to 'next' on 2022-02-28 at 1a94306611) + + stash: strip "refs/heads/" with skip_prefix "git checkout -b branch/with/multi/level/name && git stash" only recorded the last level component of the branch name, which has been corrected. - Will merge to 'next'. + Will merge to 'master'. source: <20220124205342.41450-1-chooglen@google.com> @@ -477,7 +425,8 @@ Release tarballs are available at: reasons with unsafe bytes correctly, which is worked around by introducing NUL terminated output format with "-z". - Iffy. + Expecting a reroll. + cf. source: @@ -494,13 +443,10 @@ Release tarballs are available at: "git fetch --repair" learned to fetch everything without telling the other side what we already have, which is useful when you cannot trust what you have in the local object store. - - Iffy. It may be cleaner to make a fresh clone and salvage bits - out of the suspicious repository being "repair"ed. source: -* tk/empty-untracked-cache (2022-02-25) 3 commits +* tk/empty-untracked-cache (2022-02-28) 3 commits - untracked-cache: write index when populating empty untracked cache - t7519: populate untracked cache before test - t7519: avoid file to index mtime race for untracked cache @@ -510,7 +456,7 @@ Release tarballs are available at: which has been corrected. Will merge to 'next'. - source: + source: * tk/simple-autosetupmerge (2022-02-25) 2 commits @@ -529,11 +475,11 @@ Release tarballs are available at: * tk/untracked-cache-with-uall (2022-02-25) 1 commit - untracked-cache: support '--untracked-files=all' if configured - The untracked cache system does not work well when the setting of - status.showuntrackedfiles is 'normal' and not 'all', which has been - updated. + The performance of the "untracked cache" feature has been improved + when "--untracked-files=" and "status.showUntrackedFiles" + are combined. - Needs review. + Expecting a reroll. source: @@ -552,51 +498,18 @@ Release tarballs are available at: Needs review. source: --------------------------------------------------- -[Stalled] - -* je/http-better-error-output (2021-12-03) 1 commit - . http-backend: give a hint that web browser access is not supported - - When the http-backend program, which is the server-side component - for the smart HTTP transport, sends a "404 Not found" error, we - deliberately did not say anything to the requesting client. We now - send a message back to the browser to tell the user that they do - not want to visit the URL via their browser, instead of a totally - blank page. - - Expecting a reroll. - Breaks its self tests. - cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@vanv.qr> - source: <20211202102855.23907-1-jengelh@inai.de> - - -* cb/save-term-across-editor-invocation (2021-12-01) 3 commits - - fixup! editor: allow for saving/restoring terminal state - - editor: allow for saving/restoring terminal state - - terminal: teach save_term to fail when not foreground - - Some editors are reported to leave the terminal in funny state - after they exit on Windows. Work it around by saving and restoring - the terminal state when needed. - - Expecting a reroll. - cf. - source: <20211202035446.1154-1-carenas@gmail.com> - --------------------------------------------------- -[Cooking] * en/sparse-checkout-fixes (2022-02-20) 5 commits - - sparse-checkout: reject arguments in cone-mode that look like patterns - - sparse-checkout: error or warn when given individual files - - sparse-checkout: pay attention to prefix for {set, add} - - sparse-checkout: correctly set non-cone mode when expected - - sparse-checkout: correct reapply's handling of options + (merged to 'next' on 2022-02-28 at 7307431c62) + + sparse-checkout: reject arguments in cone-mode that look like patterns + + sparse-checkout: error or warn when given individual files + + sparse-checkout: pay attention to prefix for {set, add} + + sparse-checkout: correctly set non-cone mode when expected + + sparse-checkout: correct reapply's handling of options Further polishing of "git sparse-checkout". - Will merge to 'next'. + Will merge to 'master'. source: @@ -699,10 +612,13 @@ Release tarballs are available at: Improve failure case behaviour of xdiff library when memory allocation fails. + + Will merge to 'next'. source: -* gc/recursive-fetch-with-unused-submodules (2022-02-24) 11 commits +* gc/recursive-fetch-with-unused-submodules (2022-02-28) 12 commits + - SQUASH??? - SQUASH??? - submodule: fix latent check_has_commit() bug - fetch: fetch unpopulated, changed submodules @@ -769,7 +685,8 @@ Release tarballs are available at: Implementation of "scalar diagnose" subcommand. - What's the state of this thing? + Expecting a reroll. + cf. What is the status of this thing? source: @@ -783,37 +700,28 @@ Release tarballs are available at: flexible interface than the existing "--batch" or "--batch-check" modes, to allow different kinds of inquiries made. - Will merge to 'next'? + Will merge to 'next'. source: -* ar/submodule-update (2022-02-10) 20 commits - . fixup! submodule: move core cmd_update() logic to C - . fixup! submodule--helper run-update-procedure: learn --remote - . fixup! submodule--helper run-update-procedure: remove --suboid - . submodule: move core cmd_update() logic to C - . submodule--helper: reduce logic in run_update_procedure() - . submodule--helper: move functions around - . submodule--helper update-clone: learn --init - . submodule--helper: remove ensure-core-worktree - . submodule--helper run-update-procedure: learn --remote - . submodule--helper run-update-procedure: remove --suboid - . submodule--helper: reorganize code for sh to C conversion - . submodule--helper: remove update-module-mode - . submodule tests: test for init and update failure output - . submodule--helper: don't use bitfield indirection for parse_options() - . builtin/submodule--helper.c: rename option variables to "opt" - . builtin/submodule--helper.c: reformat designated initializers - . submodule--helper: run update using child process struct - . submodule--helper: allow setting superprefix for init_submodule() - . submodule--helper: refactor get_submodule_displaypath() - . submodule--helper: get remote names from any repository - - Rewrite of "git submodule update" in C. - - Does not seem to play well with other topics in flight, with heavy conflicts. - cf. - source: <20220210092833.55360-1-chooglen@google.com> +* ar/submodule-update (2022-02-28) 13 commits + - submodule--helper update-clone: check for --filter and --init + - submodule update: add tests for --filter + - submodule--helper update-clone: learn --init + - submodule--helper: allow setting superprefix for init_submodule() + - submodule--helper: refactor get_submodule_displaypath() + - submodule--helper run-update-procedure: learn --remote + - submodule--helper: don't use bitfield indirection for parse_options() + - submodule--helper: get remote names from any repository + - submodule--helper: remove ensure-core-worktree + - submodule--helper run-update-procedure: remove --suboid + - submodule--helper: reorganize code for sh to C conversion + - submodule--helper: remove update-module-mode + - submodule tests: test for init and update failure output + + Rewrite of "git submodule update" in C (early part). + + source: <20220301044132.39474-1-chooglen@google.com> * rj/receive-pack-abort-upon-disconnect (2022-01-28) 1 commit @@ -902,17 +810,18 @@ Release tarballs are available at: * rs/bisect-executable-not-found (2022-01-19) 4 commits - - bisect--helper: double-check run command on exit code 126 and 127 - - bisect: document run behavior with exit codes 126 and 127 - - bisect--helper: release strbuf and strvec on run error - - bisect--helper: report actual bisect_state() argument on error + (merged to 'next' on 2022-02-28 at c74bff7954) + + bisect--helper: double-check run command on exit code 126 and 127 + + bisect: document run behavior with exit codes 126 and 127 + + bisect--helper: release strbuf and strvec on run error + + bisect--helper: report actual bisect_state() argument on error A not-so-common mistake is to write a script to feed "git bisect run" without making it executable, in which case all tests will exit with 126 or 127 error codes, even on revisions that are marked - as good. Try to recoginse this situation and stop iteration early. + as good. Try to recognize this situation and stop iteration early. - Will merge to 'next'? + Will merge to 'master'. source: @@ -952,28 +861,6 @@ Release tarballs are available at: source: -* tl/ls-tree-oid-only (2022-02-08) 13 commits - - ls-tree.c: support --object-only option for "git-ls-tree" - - ls-tree: introduce function "fast_path()" - - ls-tree.c: introduce "--format" option - - cocci: allow padding with `strbuf_addf()` - - ls-tree: introduce struct "show_tree_data" - - ls-tree: slightly refactor `show_tree()` - - ls-tree: fix "--name-only" and "--long" combined use bug - - ls-tree: simplify nesting if/else logic in "show_tree()" - - ls-tree: rename "retval" to "recurse" in "show_tree()" - - ls-tree: use "size_t", not "int" for "struct strbuf"'s "len" - - ls-tree: use "enum object_type", not {blob,tree,commit}_type - - ls-tree: add missing braces to "else" arms - - ls-tree: remove commented-out code - - "git ls-tree" learns "--oid-only" option, similar to "--name-only", - and more generalized "--format" option. - - What's the status of this thing? - source: - - * jh/builtin-fsmonitor-part2 (2022-02-11) 30 commits - update-index: convert fsmonitor warnings to advise - t7527: test status with untracked-cache and fsmonitor--daemon @@ -1014,14 +901,12 @@ Release tarballs are available at: source: -* es/superproject-aware-submodules (2022-02-03) 4 commits - - submodule: record superproject gitdir during 'update' - - submodule: record superproject gitdir during absorbgitdirs - - introduce submodule.superprojectGitDir record +* es/superproject-aware-submodules (2022-02-28) 3 commits + - rev-parse: short-circuit superproject worktree when config unset + - introduce submodule.hasSuperproject record - t7400-submodule-basic: modernize inspect() helper - A configuration variable in a submodule points at the location of - the superproject it is bound to (RFC). + A configuration variable in a repository tells if it is (or is not) + a submodule of a superproject. - What is the status of this thing? - source: <20220203215914.683922-1-emilyshaffer@google.com> + source: <20220301002613.1459916-1-emilyshaffer@google.com>