From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DC78C77B75 for ; Sat, 20 May 2023 00:11:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230062AbjETALH (ORCPT ); Fri, 19 May 2023 20:11:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232267AbjETAJy (ORCPT ); Fri, 19 May 2023 20:09:54 -0400 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FC271700 for ; Fri, 19 May 2023 17:08:45 -0700 (PDT) Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-25343f0c693so2716830a91.3 for ; Fri, 19 May 2023 17:08:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684541288; x=1687133288; h=mime-version:user-agent:message-id:date:subject:to:from:sender:from :to:cc:subject:date:message-id:reply-to; bh=+OiwUYLFPIiaJ4I4mpkmCX/3vRS5sdPq3jFPkvBgv/o=; b=pW+rb6FUTHzU+FQPLBnxIGH1hjKzvCUjk03qTBfJndM5cFeXz7/utD+M4XUJ9B2eDX 7Jz5YTAAhNa4P7znsp1uPvtafzcFbFmhlkUssln+nZ/6unry2bavuS8XHqnR2VtF/3/c 8pNF6c8F0cN/pJfRj9F05SrQUEbGM1ipg6VBiIw0lDlxTNQALVQfUdBLLQMUnkKBfPb+ cUckvlr/X0bLRFoxD2yA33CojD5Hxj6VF1IcOXGQ89U8c35i/PPjxU3XItqq2nypY39A RGl3HLK8fHnjZaVF9gY7Q0JEtBztiAa/xoxDi+ZeBsOelPynUSUTF4MI/3ACKmUlHlRE 25MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684541288; x=1687133288; h=mime-version:user-agent:message-id:date:subject:to:from:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+OiwUYLFPIiaJ4I4mpkmCX/3vRS5sdPq3jFPkvBgv/o=; b=k6i67cwRyiPopNnQNfSrqN+X9S80P2iymli1BPiTQUyaS1px03arq0laE6PLH0lupc rF0VU/uTYCbSWAH/MYXjgme03Go1Gt78rV8UG2BA4PDACuznuSPUEUDIgMdv/ZxFZ1bQ mB0GRXWWKr8PeyoS+auLiKf1wuVQc9SVSawHCqECRwHnuAClUy1MphBwe6zt8zpttW3l bm+AeMMoltoiMl7ZDR1hew06AG49unN3dhE4BCpn9OL+atQu0jvH7bhL9vWyTsBASPYJ Wb7FGPeCCerFVgTdtAxhn52XwuFbqltwglRrtw3noMe8VbLSah+ZDVjfUyQ5koMbem93 jiqA== X-Gm-Message-State: AC+VfDwzLwpUuiEYzTkQ+1rHV8msvZNAStcJ84ruevpdADRuRJ87LDWy lz3AOxooCDfupgtFgjCI0Renbjczfc8= X-Google-Smtp-Source: ACHHUZ5cF9PE6T5Cv6tw22tuA4VS/S0rVbr9cUuF8RQEIK1r2lSsC15iBjqJO8gl+vI9+niHkmLE+w== X-Received: by 2002:a17:90a:c405:b0:24e:4cf8:235 with SMTP id i5-20020a17090ac40500b0024e4cf80235mr3612519pjt.0.1684541287254; Fri, 19 May 2023 17:08:07 -0700 (PDT) Received: from localhost (217.195.118.34.bc.googleusercontent.com. [34.118.195.217]) by smtp.gmail.com with ESMTPSA id 14-20020a17090a08ce00b002500df72713sm2008960pjn.7.2023.05.19.17.08.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 17:08:06 -0700 (PDT) Sender: Junio C Hamano From: Junio C Hamano To: git@vger.kernel.org Subject: What's cooking in git.git (May 2023, #06; Fri, 19) X-master-at: 9e49351c3060e1fa6e0d2de64505b7becf157f28 X-next-at: 5a3d083765c8d12722317bbf4686ddbaa5521b92 Date: Sat, 20 May 2023 09:08:06 +0900 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Here are the topics that have been cooking in my tree. Commits prefixed with '+' are in 'next' (being in 'next' is a sign that a topic is stable enough to be used and are candidate to be in a future release). Commits prefixed with '-' are only in 'seen', and aren't considered "accepted" at all and may be annotated with an URL to a message that raises issues but they are no means exhaustive. A topic without enough support may be discarded after a long period of no activity. Git 2.41-rc1 has been tagged. Thanks for catching and fixing a few regressions that escaped to the 'master' front so quickly, everybody. Starting next week, until early June, my availability may be sporadic, but this time I won't be completely away from the keyboard to require an interrim maintainer. Copies of the source code to Git live in many repositories, and the following is a list of the ones I push into or their mirrors. Some repositories have only a subset of branches. With maint, master, next, seen, todo: git://git.kernel.org/pub/scm/git/git.git/ git://repo.or.cz/alt-git.git/ https://kernel.googlesource.com/pub/scm/git/git/ https://github.com/git/git/ https://gitlab.com/git-vcs/git/ With all the integration branches and topics broken out: https://github.com/gitster/git/ Even though the preformatted documentation in HTML and man format are not sources, they are published in these repositories for convenience (replace "htmldocs" with "manpages" for the manual pages): git://git.kernel.org/pub/scm/git/git-htmldocs.git/ https://github.com/gitster/git-htmldocs.git/ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- [Graduated to 'master'] * bc/clone-empty-repo-via-protocol-v0 (2023-05-17) 1 commit (merged to 'next' on 2023-05-17 at d320de7ee9) + upload-pack: advertise capabilities when cloning empty repos The server side of "git clone" now advertises the necessary hints to clients to help them to clone from an empty repository and learn object hash algorithm and the (unborn) branch pointed at by HEAD, even over the older v0/v1 protocol. source: <20230517192443.1149190-2-sandals@crustytoothpaste.net> * cg/doc-http-lowspeed-limit (2023-05-14) 1 commit (merged to 'next' on 2023-05-19 at 5b48044bf5) + doc/git-config: add unit for http.lowSpeedLimit Doc update. source: * jc/attr-source-tree (2023-05-06) 1 commit (merged to 'next' on 2023-05-10 at cb94f4fba6) + attr: teach "--attr-source=" global option to "git" "git --attr-source= cmd $args" is a new way to have any command to read attributes not from the working tree but from the given tree object. source: * jc/do-not-negate-test-helpers (2023-05-16) 3 commits (merged to 'next' on 2023-05-19 at 9c0221a2db) + test: do not negate test_path_is_* to assert absense + t2021: do not negate test_path_is_dir + tests: do not negate test_path_exists Small fixes. source: <20230516022646.648123-1-gitster@pobox.com> * jc/send-email-pre-process-fix (2023-05-17) 2 commits (merged to 'next' on 2023-05-18 at 38a2de93b3) + t9001: mark the script as no longer leak checker clean (merged to 'next' on 2023-05-17 at fa1900a383) + send-email: clear the $message_id after validation When "git send-email" that uses the validate hook is fed a message without and then with Message-ID, it failed to auto-assign a unique Message-ID to the former and instead reused the Message-ID from the latter, which has been corrected. This was a fix for a recent regression caught before the release, so no need to mention it in the release notes. source: * jk/http-test-cgipassauth-unavailable-in-older-apache (2023-05-18) 1 commit (merged to 'next' on 2023-05-18 at 3f132b7071) + t/lib-httpd: make CGIPassAuth support conditional We started unconditionally testing with CGIPassAuth directive but it is unavailable in older Apache that ships with CentOS 7 that has about a year of shelf-life still left. The test has conditionally been disabled when running with an ancient Apache. This was a fix for a recent regression caught before the release, so no need to mention it in the release notes. source: <20230518192102.GA1514485@coredump.intra.peff.net> * js/rebase-count-fixes (2023-05-14) 2 commits (merged to 'next' on 2023-05-19 at 6503a9a17b) + rebase -r: fix the total number shown in the progress + rebase --update-refs: fix loops A few bugs in the sequencer machinery that results in miscounting the steps have been corrected. source: * tb/run-command-needs-alloc-h (2023-05-16) 1 commit (merged to 'next' on 2023-05-16 at b87f41e99e) + run-command.c: fix missing include under `NO_PTHREADS` Fix the build problem with NO_PTHREADS defined, a fallout from recent header file shuffling. source: -------------------------------------------------- [New Topics] * mh/credential-libsecret-attrs (2023-05-17) 1 commit - credential/libsecret: store new attributes The way authentication related data other than passwords (e.g. oath token and password expiration data) are stored in libsecret keyrings has been rethought. Needs review. source: * ps/fetch-cleanups (2023-05-17) 9 commits - fetch: use `fetch_config` to store "submodule.fetchJobs" value - fetch: use `fetch_config` to store "fetch.parallel" value - fetch: use `fetch_config` to store "fetch.recurseSubmodules" value - fetch: use `fetch_config` to store "fetch.showForcedUpdates" value - fetch: use `fetch_config` to store "fetch.pruneTags" value - fetch: use `fetch_config` to store "fetch.prune" value - fetch: pass through `fetch_config` directly - fetch: drop unneeded NULL-check for `remote_ref` - fetch: drop unused DISPLAY_FORMAT_UNKNOWN enum value Code clean-up. Needs review. source: * sl/diff-tree-sparse (2023-05-18) 1 commit - diff-tree: integrate with sparse index "git diff-tree" has been taught to take advantage of the sparse-index feature. Comments? source: <20230518154454.475487-1-cheskaqiqi@gmail.com> * jk/format-patch-message-id-unleak (2023-05-19) 2 commits - format-patch: free elements of rev.ref_message_ids list - format-patch: free rev.message_id when exiting Leakfix. Will merge to 'next'. source: <20230519000239.GA1975039@coredump.intra.peff.net> * jc/test-modernization (2023-05-19) 20 commits - t7101-reset-empty-subdirs: modernize test format - t6050-replace: modernize test format - t5306-pack-nobase: modernize test format - t5303-pack-corruption-resilience: modernize test format - t5301-sliding-window: modernize test format - t5300-pack-object: modernize test format - t4206-log-follow-harder-copies: modernize test format - t4202-log: modernize test format - t4004-diff-rename-symlink: modernize test format - t4003-diff-rename-1: modernize test format - t4002-diff-basic: modernize test format - t3903-stash: modernize test format - t3700-add: modernize test format - t3500-cherry: modernize test format - t1006-cat-file: modernize test format - t1002-read-tree-m-u-2way: modernize test format - t1001-read-tree-m-2way: modernize test format - t3210-pack-refs: modernize test format - t0030-stripspace: modernize test format - t0000-basic: modernize test format source: -------------------------------------------------- [Stalled] * ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit - fsmonitor: handle differences between Windows named pipe functions Fix fsmonitor on Windows when the filesystem path contains certain characters. Expecting a reroll. cf. source: * rn/sparse-diff-index (2023-04-10) 1 commit - diff-index: enable sparse index "git diff-index" command has been taught to work better with the sparse index. Expecting a reroll. cf. <62821012-4fc3-5ad8-695c-70f7ab14a8c9@github.com> source: <20230408112342.404318-1-nanth.raghul@gmail.com> * es/recurse-submodules-option-is-a-bool (2023-04-10) 1 commit - usage: clarify --recurse-submodules as a boolean The "--[no-]recurse-submodules" option of "git checkout" and others supported an undocumented syntax --recurse-submodules= where the value can spell a Boolean in various ways. The support for the syntax is being dropped. Expecting a reroll. cf. source: * tb/pack-bitmap-index-seek (2023-03-20) 6 commits - pack-bitmap.c: factor out `bitmap_index_seek_commit()` - pack-bitmap.c: use `bitmap_index_seek()` where possible - pack-bitmap.c: factor out manual `map_pos` manipulation - pack-bitmap.c: drop unnecessary 'inline's - pack-bitmap.c: hide bitmap internals in `read_be32()` - pack-bitmap.c: hide bitmap internals in `read_u8()` Clean-up the pack-bitmap codepath. Kicked back to 'seen' out of 'next'. There is a BUG() on data errors that needs to be fixed. source: * cb/checkout-same-branch-twice (2023-03-22) 2 commits - SQUASH??? the test marked to expect failure passes from day one - checkout/switch: disallow checking out same branch in multiple worktrees "git checkout -B $branch" failed to protect against checking out a branch that is checked out elsewhere, unlike "git branch -f" did. Expecting a hopefully minor and final reroll. cf. source: <20230120113553.24655-1-carenas@gmail.com> * tk/pull-conflict-suggest-rebase-merge-not-rebase-true (2023-02-13) 1 commit - pull: conflict hint pull.rebase suggestion should offer "merges" vs "true" In an advice message after failed non-ff pull, we used to suggest setting pull.rebase=true, but these days pull.rebase=merges may be more inline with the original spirit of "rebuild your side on top of theirs". May want to discard. This is too much of a departure from the existing practice. cf. cf. source: * ab/tag-object-type-errors (2023-05-10) 4 commits - tag: don't emit potentially incorrect "object is a X, not a Y" - tag: don't misreport type of tagged objects in errors - object tests: add test for unexpected objects in tags - Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors Hardening checks around mismatched object types when one of those objects is a tag. source: * ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit - test-lib: allow storing counts with test harnesses Allow summary results from tests to be written to t/test-results directory even when a test harness like 'prove' is in use. Expecting a reroll. cf. source: <20221224225200.1027806-1-adam@dinwoodie.org> * so/diff-merges-more (2022-12-18) 5 commits - diff-merges: improve --diff-merges documentation - diff-merges: issue warning on lone '-m' option - diff-merges: support list of values for --diff-merges - diff-merges: implement log.diffMerges-m-imply-p config - diff-merges: implement [no-]hide option and log.diffMergesHide config Assorted updates to "--diff-merges=X" option. May want to discard. Breaking compatibility does not seem worth it. source: <20221217132955.108542-1-sorganov@gmail.com> * ab/imap-send-requires-curl (2023-02-02) 6 commits - imap-send: correctly report "host" when using "tunnel" - imap-send: remove old --no-curl codepath - imap-send: make --curl no-optional - imap-send: replace auto-probe libcurl with hard dependency - imap-send doc: the imap.sslVerify is used with imap.tunnel - imap-send: note "auth_method", not "host" on auth method failure Give a hard dependency on cURL library to build "git imap-send", and remove the code to interact with IMAP server without using cURL. Expecting a reroll. The 'tunnel' part is still iffy. cf. <230203.86bkmabfjr.gmgdl@evledraar.gmail.com> source: * cw/submodule-status-in-parallel (2023-03-02) 6 commits - diff-lib: parallelize run_diff_files for submodules - diff-lib: refactor out diff_change logic - submodule: refactor is_submodule_modified() - submodule: move status parsing into function - submodule: rename strbuf variable - run-command: add on_stderr_output_fn to run_processes_parallel_opts "git submodule status" learned to run the comparison in submodule repositories in parallel. Expecting a reroll. cf. cf. <230307.865ybc273g.gmgdl@evledraar.gmail.com> source: <20230302215237.1473444-1-calvinwan@google.com> -------------------------------------------------- [Cooking] * ja/worktree-orphan (2023-05-17) 8 commits - worktree add: emit warn when there is a bad HEAD - worktree add: extend DWIM to infer --orphan - worktree add: introduce "try --orphan" hint - worktree add: add --orphan flag - t2400: add tests to verify --quiet - t2400: refactor "worktree add" opt exclusion tests - t2400: cleanup created worktree in test - worktree add: include -B in usage docs 'git worktree add' learned how to create a worktree based on an orphaned branch with `--orphan`. source: <20230517214711.12467-1-jacobabel@nullpo.dev> * kh/keep-tag-editmsg-upon-failure (2023-05-16) 3 commits (merged to 'next' on 2023-05-19 at fc0fe3173d) + tag: keep the message file in case ref transaction fails + t/t7004-tag: add regression test for successful tag creation + doc: tag: document `TAG_EDITMSG` "git tag" learned to leave the "$GIT_DIR/TAG_EDITMSG" file when the command failed, so that the user can salvage what they typed. Will cook in 'next'. source: * sa/doc-ls-remote (2023-05-19) 6 commits (merged to 'next' on 2023-05-20 at d577bf75a0) + ls-remote doc: document the output format + ls-remote doc: explain what each example does + ls-remote doc: show peeled tags in examples + ls-remote doc: remove redundant --tags example + show-branch doc: say , not + show-ref doc: update for internal consistency Doc update. Will cook in 'next'. source: * tb/refs-exclusion-and-packed-refs (2023-05-15) 16 commits - ls-refs.c: avoid enumerating hidden refs where possible - upload-pack.c: avoid enumerating hidden refs where possible - builtin/receive-pack.c: avoid enumerating hidden references - refs.h: let `for_each_namespaced_ref()` take excluded patterns - refs/packed-backend.c: ignore complicated hidden refs rules - revision.h: store hidden refs in a `strvec` - refs/packed-backend.c: add trace2 counters for jump list - refs/packed-backend.c: implement jump lists to avoid excluded pattern(s) - refs/packed-backend.c: refactor `find_reference_location()` - refs: plumb `exclude_patterns` argument throughout - builtin/for-each-ref.c: add `--exclude` option - ref-filter.c: parameterize match functions over patterns - ref-filter: add `ref_filter_clear()` - ref-filter: clear reachable list pointers after freeing - ref-filter.h: provide `REF_FILTER_INIT` - refs.c: rename `ref_filter` Enumerating refs in the packed-refs file, while excluding refs that match certain patterns, has been optimized. Will merge to 'next'? source: * zh/ls-files-format-atoms (2023-05-14) 2 commits - ls-files: add %(objectsize) atom to format option - ls-files: add %(objecttype) atom to format option Some atoms that can be used in "--format=" for "git ls-tree" were not supported by "git ls-files", even though they were relevant in the context of the latter. source: * tc/cat-file-z-use-cquote (2023-05-10) 1 commit - cat-file: quote-format name in error when using -z "cat-file" in the batch mode that is fed NUL-terminated pathnames learned to cquote them in its error output (otherwise, a funny pathname with LF in it would break the lines in the output stream). Redesign. source: <20230510190116.795641-2-toon@iotcl.com> * en/header-split-cache-h-part-3 (2023-05-16) 29 commits - fsmonitor-ll.h: split this header out of fsmonitor.h - hash-ll, hashmap: move oidhash() to hash-ll - object-store-ll.h: split this header out of object-store.h - khash: name the structs that khash declares - merge-ll: rename from ll-merge - git-compat-util.h: remove unneccessary include of wildmatch.h - builtin.h: remove unneccessary includes - list-objects-filter-options.h: remove unneccessary include - diff.h: remove unnecessary include of oidset.h - repository: remove unnecessary include of path.h - log-tree: replace include of revision.h with simple forward declaration - cache.h: remove this no-longer-used header - read-cache*.h: move declarations for read-cache.c functions from cache.h - repository.h: move declaration of the_index from cache.h - merge.h: move declarations for merge.c from cache.h - diff.h: move declaration for global in diff.c from cache.h - preload-index.h: move declarations for preload-index.c from elsewhere - sparse-index.h: move declarations for sparse-index.c from cache.h - name-hash.h: move declarations for name-hash.c from cache.h - run-command.h: move declarations for run-command.c from cache.h - statinfo: move stat_{data,validity} functions from cache/read-cache - read-cache: move shared add/checkout/commit code - add: modify add_files_to_cache() to avoid globals - read-cache: move shared commit and ls-files code - setup: adopt shared init-db & clone code - init-db, clone: change unnecessary global into passed parameter - init-db: remove unnecessary global variable - init-db: document existing bug with core.bare in template config - Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-part-3 Header files cleanup. source: * la/doc-interpret-trailers (2023-05-11) 9 commits - doc: trailer: add more examples in DESCRIPTION - doc: trailer: mention 'key' in DESCRIPTION - doc: trailer..command: emphasize deprecation - doc: trailer: use angle brackets for and - doc: trailer: remove redundant phrasing - doc: trailer: examples: avoid the word "message" by itself - doc: trailer: drop "commit message part" phrasing - doc: trailer: swap verb order - doc: trailer: fix grammar Doc update. On hold. Looking good. Want to be rebased once kh/doc-interpret-trailers-updates lands. source: * cc/git-replay (2023-05-09) 16 commits - SQUASH??? - replay: stop assuming replayed branches do not diverge - replay: add --contained to rebase contained branches - replay: add --advance or 'cherry-pick' mode - replay: disallow revision specific options and pathspecs - replay: use standard revision ranges - replay: make it a minimal server side command - replay: remove HEAD related sanity check - replay: remove progress and info output - replay: add an important FIXME comment about gpg signing - replay: don't simplify history - replay: introduce pick_regular_commit() - replay: die() instead of failing assert() - replay: start using parse_options API - replay: introduce new builtin - t6429: remove switching aspects of fast-rebase source: <20230509175347.1714141-1-christian.couder@gmail.com> * jc/pack-ref-exclude-include (2023-05-12) 3 commits - pack-refs: teach pack-refs --include option - pack-refs: teach --exclude option to exclude refs from being packed - docs: clarify git-pack-refs --all will pack all refs "git pack-refs" learns "--include" and "--exclude" to tweak the ref hierarchy to be packed using pattern matching. Will merge to 'next'. source: * tb/gc-recent-object-hook (2023-05-15) 2 commits - gc: introduce `gc.recentObjectsHook` - reachable.c: extract `obj_is_recent()` "git pack-objects" learned to invoke a new hook program that enumerates extra objects to be used as anchoring points to keep otherwise unreachable objects in cruft packs. source: * jc/diff-s-with-other-options (2023-05-05) 1 commit (merged to 'next' on 2023-05-20 at dda3826a68) + diff: fix interaction between the "-s" option and other options The "-s" (silent, squelch) option of the "diff" family of commands did not interact with other options that specify the output format well. This has been cleaned up so that it will clear all the formatting options given before. Will cook in 'next'. source: <20230505165952.335256-1-gitster@pobox.com> * ob/revert-of-revert (2023-05-05) 1 commit - sequencer: beautify subject of reverts of reverts Instead of "Revert "Revert "original"", give "Reapply "original"" as the title for a revert of a revert. Expecting a hopefully final reroll. Looking much better, except for minor cosmetic issues. source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de> * cw/strbuf-cleanup (2023-05-12) 7 commits (merged to 'next' on 2023-05-15 at 31d08296f2) + strbuf: remove global variable + strbuf: clarify dependency + path: move related function to path + object-name: move related functions to object-name + credential-store: move related functions to credential-store file + abspath: move related functions to abspath + strbuf: clarify API boundary Move functions that are not about pure string manipulation out of strbuf.[ch] Will cook in 'next'. source: <20230512171429.2202982-1-calvinwan@google.com> * tl/notes-separator (2023-04-28) 6 commits (merged to 'next' on 2023-05-06 at 598ed19c9b) + notes.c: introduce "--[no-]stripspace" option + notes.c: append separator instead of insert by pos + notes.c: introduce '--separator=' option + t3321: add test cases about the notes stripspace behavior + notes.c: use designated initializers for clarity + notes.c: cleanup 'strbuf_grow' call in 'append_edit' 'git notes append' was taught '--separator' to specify string to insert between paragraphs. On hold. source: * pw/rebase-i-after-failure (2023-04-21) 6 commits - rebase -i: fix adding failed command to the todo list - rebase: fix rewritten list for failed pick - rebase --continue: refuse to commit after failed command - sequencer: factor out part of pick_commits() - rebase -i: remove patch file after conflict resolution - rebase -i: move unlink() calls Various fixes to the behaviour of "rebase -i" when the command got interrupted by conflicting changes. Expecting a reroll. cf. cf. <1fd54422-b66a-c2e4-7cd7-934ea01190ad@gmail.com> source: * sl/sparse-write-tree-part-2 (2023-05-08) 1 commit - t1092: update a write-tree test Fix-up to a topic already graduated to 'master'. Will merge to 'next' and then to 'master'. source: <20230508202140.464363-1-cheskaqiqi@gmail.com> * tb/pack-bitmap-traversal-with-boundary (2023-05-08) 3 commits - pack-bitmap.c: use commit boundary during bitmap traversal - pack-bitmap.c: extract `fill_in_bitmap()` - object: add object_array initializer helper function The object traversal using reachability bitmap done by "pack-object" has been tweaked to take advantage of the fact that using "boundary" commits as representative of all the uninteresting ones can save quite a lot of object enumeration. source: * gc/doc-cocci-updates (2023-04-27) 2 commits (merged to 'next' on 2023-05-20 at 3fe237c1a8) + cocci: codify authoring and reviewing practices + cocci: add headings to and reword README Update documentation regarding Coccinelle patches. Will cook in 'next'. source: * pb/complete-and-document-auto-merge-and-friends (2023-04-14) 5 commits (merged to 'next' on 2023-04-20 at 2728a01622) + completion: complete AUTO_MERGE + Documentation: document AUTO_MERGE + git-merge.txt: modernize word choice in "True merge" section + completion: complete REVERT_HEAD and BISECT_HEAD + revisions.txt: document more special refs Document more pseudo-refs and teach the command line completion machinery to complete AUTO_MERGE. On hold, waiting for a fix-up. cf. source: * mh/credential-password-expiry-libsecret (2023-05-05) 1 commit (merged to 'next' on 2023-05-09 at fd898e3756) + credential/libsecret: support password_expiry_utc The libsecret credential helper learns to handle the password expiry time information. On hold. The database gets littered with entries whose expiration dates only differ. cf. source: -------------------------------------------------- [Discarded] * ed/fsmonitor-inotify (2022-12-13) 6 commits . fsmonitor: update doc for Linux . fsmonitor: test updates . fsmonitor: enable fsmonitor for Linux . fsmonitor: implement filesystem change listener for Linux . fsmonitor: determine if filesystem is local or remote . fsmonitor: prepare to share code between Mac OS and Linux Bundled fsmonitor for Linux using inotify API. Seems to break asan job at CI when merged to 'seen'. cf. source: * my/wildmatch-cleanups (2023-02-27) 5 commits . wildmatch: more cleanups after killing uchar . wildmatch: use char instead of uchar . wildmatch: remove NEGATE_CLASS(2) macros with trivial refactoring . wildmatch: remove IS*() macros . git-compat-util: add isblank() and isgraph() Code clean-up. Discarded without prejudice after more than 6 weeks of inactivity. source: <20230226115021.1681834-1-masahiroy@kernel.org> * cw/forbid-use-of-gitlink-outside-submodules (2023-02-28) 6 commits . add: reject nested repositories . tests: remove duplicate .gitmodules path . tests: use `git submodule add` and fix expected status . tests: use `git submodule add` and fix expected diffs . tests: Use `git submodule add` instead of `git add` . t4041, t4060: modernize test style Forbid "git add dir" from adding a gitlink to the index. Discarded without prejudice after more than 6 weeks of inactivity. source: <20230228185253.2356546-1-calvinwan@google.com> * nw/for-each-ref-signature (2023-03-13) 1 commit . ref-filter: add new "signature" atom "git (for-each-ref|branch|tag) --format=" learns the "%(signature)" placeholder and friends. Breaks CI. cf. source: <20230311210607.64927-2-nsengiyumvawilberforce@gmail.com> * fc/asciidoc-code-block-hack (2023-05-04) 2 commits . doc: manpage: remove ancient workaround . doc: git-svn: use listing instead of verse Documentation toolchain lost an ancient workaround that is no longer needed. The contributor is no longer with the project. source: <20230504035517.329765-1-felipe.contreras@gmail.com> * fc/doc-revisions-markup-fix (2023-05-04) 2 commits . doc: revisions: add a bunch of missing quotes . doc: revisions: fix missing escape Doc cleanup. The contributor is no longer with the project. source: <20230504163421.100400-1-felipe.contreras@gmail.com>