{"thread":{"id":"59291","subject":"What's cooking in git.git (Feb 2023, #04; Wed, 22)","startedAt":"2023-02-23T03:12:30Z","lastAt":"2023-02-27T17:19:30Z","messageCount":6,"participants":["Junio C Hamano","Victoria Dye","Jeff King","Glen Choo","Matthew John Cheetham"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"472470","messageId":"xmqqbkllaxd7.fsf@gitster.g","threadId":"59291","inReplyTo":null,"subject":"What's cooking in git.git (Feb 2023, #04; Wed, 22)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-02-23T03:12:20Z","receivedAt":"2023-02-23T03:12:30Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Here are the topics that have been cooking in my tree. Commits\nprefixed with '+' are in 'next' (being in 'next' is a sign that a\ntopic is stable enough to be used and are candidate to be in a future\nrelease). Commits prefixed with '-' are only in 'seen', and aren't\nconsidered \"accepted\" at all. A topic without enough support may be\ndiscarded after a long period of no activity.\n\nCopies of the source code to Git live in many repositories, and the\nfollowing is a list of the ones I push into or their mirrors. Some\nrepositories have only a subset of branches.\n\nWith maint, master, next, seen, todo:\n\n\tgit://git.kernel.org/pub/scm/git/git.git/\n\tgit://repo.or.cz/alt-git.git/\n\thttps://kernel.googlesource.com/pub/scm/git/git/\n\thttps://github.com/git/git/\n\thttps://gitlab.com/git-vcs/git/\n\nWith all the integration branches and topics broken out:\n\n\thttps://github.com/gitster/git/\n\nEven though the preformatted documentation in HTML and man format\nare not sources, they are published in these repositories for\nconvenience (replace \"htmldocs\" with \"manpages\" for the manual\npages):\n\n\tgit://git.kernel.org/pub/scm/git/git-htmldocs.git/\n\thttps://github.com/gitster/git-htmldocs.git/\n\nRelease tarballs are available at:\n\n\thttps://www.kernel.org/pub/software/scm/git/\n\n--------------------------------------------------\n[Graduated to 'master']\n\n* ab/config-h-remove-unused (2023-02-07) 1 commit\n (merged to 'next' on 2023-02-09 at fa83258b81)\n + config.h: remove unused git_configset_add_parameters()\n\n Code clean-up.\n source: \n\n\n* ab/hook-api-with-stdin (2023-02-08) 5 commits\n (merged to 'next' on 2023-02-13 at 4cb74ecb6b)\n + hook: support a --to-stdin= option\n + sequencer: use the new hook API for the simpler \"post-rewrite\" call\n + hook API: support passing stdin to hooks, convert am's 'post-rewrite'\n + run-command: allow stdin for run_processes_parallel\n + run-command.c: remove dead assignment in while-loop\n\n Extend the run-hooks API to allow feeding data from the standard\n input when running the hook script(s).\n source: \n\n\n* ab/retire-scripted-add-p (2023-02-06) 3 commits\n (merged to 'next' on 2023-02-09 at 1b8c7bce7d)\n + docs & comments: replace mentions of \"git-add--interactive.perl\"\n + add API: remove run_add_interactive() wrapper function\n + add: remove \"add.interactive.useBuiltin\" & Perl \"git add--interactive\"\n\n Finally retire the scripted \"git add -p/-i\" implementation and have\n everybody use the one reimplemented in C.\n source: \n\n\n* ab/sequencer-unleak (2023-02-06) 8 commits\n (merged to 'next' on 2023-02-09 at 98bff1953f)\n + commit.c: free() revs.commit in get_fork_point()\n + builtin/rebase.c: free() \"options.strategy_opts\"\n + sequencer.c: always free() the \"msgbuf\" in do_pick_commit()\n + builtin/rebase.c: fix \"options.onto_name\" leak\n + builtin/revert.c: move free-ing of \"revs\" to replay_opts_release()\n + sequencer API users: fix get_replay_opts() leaks\n + sequencer.c: split up sequencer_remove_state()\n + rebase: use \"cleanup\" pattern in do_interactive_rebase()\n\n Plug leaks in sequencer subsystem and its users.\n source: \n\n\n* ab/the-index-compatibility (2023-02-10) 6 commits\n (merged to 'next' on 2023-02-13 at 4f9869d4cf)\n + cocci & cache.h: remove \"USE_THE_INDEX_COMPATIBILITY_MACROS\"\n + cache-tree API: remove redundant update_main_cache_tree()\n + cocci & cache-tree.h: migrate \"write_cache_as_tree\" to \"*_index_*\"\n + cocci & cache.h: apply pending \"index_cache_pos\" rule\n + cocci & cache.h: fully apply \"active_nr\" part of index-compatibility\n + builtin/rm.c: use narrower \"USE_THE_INDEX_VARIABLE\"\n\n Remove more remaining uses of macros that relies on the_index\n singleton instance without explicitly spelling it out.\n source: \n\n\n* ab/various-leak-fixes (2023-02-06) 19 commits\n (merged to 'next' on 2023-02-13 at 0cee9746f7)\n + push: free_refs() the \"local_refs\" in set_refspecs()\n + push: refactor refspec_append_mapped() for subsequent leak-fix\n + receive-pack: release the linked \"struct command *\" list\n + grep API: plug memory leaks by freeing \"header_list\"\n + grep.c: refactor free_grep_patterns()\n + builtin/merge.c: free \"&buf\" on \"Your local changes...\" error\n + builtin/merge.c: use fixed strings, not \"strbuf\", fix leak\n + show-branch: free() allocated \"head\" before return\n + commit-graph: fix a parse_options_concat() leak\n + http-backend.c: fix cmd_main() memory leak, refactor reg{exec,free}()\n + http-backend.c: fix \"dir\" and \"cmd_arg\" leaks in cmd_main()\n + worktree: fix a trivial leak in prune_worktrees()\n + repack: fix leaks on error with \"goto cleanup\"\n + name-rev: don't xstrdup() an already dup'd string\n + various: add missing clear_pathspec(), fix leaks\n + clone: use free() instead of UNLEAK()\n + commit-graph: use free_commit_graph() instead of UNLEAK()\n + bundle.c: don't leak the \"args\" in the \"struct child_process\"\n + tests: mark tests as passing with SANITIZE=leak\n\n Leak fixes.\n source: \n\n\n* ar/userdiff-java-update (2023-02-08) 3 commits\n (merged to 'next' on 2023-02-09 at f62497382a)\n + userdiff: support Java sealed classes\n + userdiff: support Java record types\n + userdiff: support Java type parameters\n\n Userdiff regexp update for Java language.\n source: <20230207234259.452141-1-rybak.a.v@gmail.com>\n\n\n* cb/grep-fallback-failing-jit (2023-01-31) 1 commit\n (merged to 'next' on 2023-02-08 at 3a70d6ef6c)\n + grep: fall back to interpreter if JIT memory allocation fails\n\n In an environment where dynamically generated code is prohibited to\n run (e.g. SELinux), failure to JIT pcre patterns is expected. Fall\n back to interpreted execution in such a case.\n source: <20230131185611.520311-1-minipli@grsecurity.net>\n\n\n* cw/doc-pushurl-vs-url (2023-02-07) 1 commit\n (merged to 'next' on 2023-02-09 at 21b0678d19)\n + Documentation: clarify multiple pushurls vs urls\n\n Doc update.\n source: <20230207181227.361290-1-calvinwan@google.com>\n\n\n* ds/bundle-uri-5 (2023-01-31) 11 commits\n (merged to 'next' on 2023-02-08 at 1ba9ba565d)\n + bundle-uri: test missing bundles with heuristic\n + bundle-uri: store fetch.bundleCreationToken\n + fetch: fetch from an external bundle URI\n + bundle-uri: drop bundle.flag from design doc\n + clone: set fetch.bundleURI if appropriate\n + bundle-uri: download in creationToken order\n + bundle-uri: parse bundle..creationToken values\n + bundle-uri: parse bundle.heuristic=creationToken\n + t5558: add tests for creationToken heuristic\n + bundle: verify using check_connected()\n + bundle: test unbundling with incomplete history\n\n The bundle-URI subsystem adds support for creation-token heuristics\n to help incremental fetches.\n source: \n\n\n* en/name-rev-make-taggerdate-much-less-important (2023-02-09) 1 commit\n (merged to 'next' on 2023-02-10 at 059bc956aa)\n + name-rev: fix names by dropping taggerdate workaround\n\n \"git name-rev\" heuristics update.\n source: \n\n\n* jk/doc-ls-remote-matching (2023-02-10) 2 commits\n (merged to 'next' on 2023-02-13 at 79a209bcb3)\n + doc/ls-remote: clarify pattern format\n + doc/ls-remote: cosmetic cleanups for examples\n\n Doc update.\n source: \n\n\n* kf/t5000-modernise (2023-02-06) 1 commit\n (merged to 'next' on 2023-02-09 at 0341c54639)\n + t5000: modernise archive and :(glob) test\n\n Test clean-up.\n source: <20230204204124.80741-1-kostya.farber@gmail.com>\n\n\n* po/attributes-text (2023-02-06) 1 commit\n (merged to 'next' on 2023-02-09 at 8be7b134da)\n + .gitattributes: include `text` attribute for eol attributes\n\n In-tree .gitattributes update to match the way we recommend our\n users to mark a file as text.\n source: <20230203125920.751-1-philipoakley@iee.email>\n\n\n* rs/cache-tree-strbuf-growth-fix (2023-02-10) 1 commit\n (merged to 'next' on 2023-02-13 at fd9ae8790b)\n + cache-tree: fix strbuf growth in prime_cache_tree_rec()\n\n Remove unnecessary explicit sizing of strbuf.\n source: \n\n\n* rs/size-t-fixes (2023-02-06) 2 commits\n (merged to 'next' on 2023-02-09 at 4bf6998479)\n + pack-objects: use strcspn(3) in name_cmp_len()\n + read-cache: use size_t for {base,df}_name_compare()\n\n Type fixes.\n source: <7315487c-c97c-b8a2-d3b2-4fbf642495dd@web.de>\n\n\n* wl/new-command-doc (2023-02-06) 1 commit\n (merged to 'next' on 2023-02-09 at 23bcd4d4d9)\n + new-command.txt: update reference to builtin docs\n\n Comment fix.\n source: \n\n--------------------------------------------------\n[New Topics]\n\n* jc/diff-algo-attribute (2023-02-21) 2 commits\n (merged to 'next' on 2023-02-22 at 2375640330)\n + diff: teach diff to read algorithm from diff driver\n + diff: consolidate diff algorithm option parsing\n\n The \"diff\" drivers specified by the \"diff\" attribute attached to\n paths can now specify which algorithm (e.g. histogram) to use.\n\n Will merge to 'master'.\n source: \n\n\n* jk/shorten-unambiguous-ref-wo-sscanf (2023-02-15) 3 commits\n - shorten_unambiguous_ref(): avoid sscanf()\n - shorten_unambiguous_ref(): use NUM_REV_PARSE_RULES constant\n - shorten_unambiguous_ref(): avoid integer truncation\n\n sscanf(3) used in \"git symbolic-ref --short\" implementation found\n to be not working reliably on macOS in UTF-8 locales. Rewrite the\n code to avoid sscanf() altogether to work it around.\n\n Will merge to 'next'?\n source: \n\n\n* js/gpg-errors (2023-02-15) 2 commits\n (merged to 'next' on 2023-02-16 at 510898ff10)\n + gpg: do show gpg's error message upon failure\n + t7510: add a test case that does not need gpg\n\n Error messages given upon a signature verification failure used to\n discard the errors from underlying gpg program, which has been\n corrected.\n\n Will merge to 'master'.\n source: \n\n\n* jc/genzeros-avoid-raw-write (2023-02-16) 1 commit\n (merged to 'next' on 2023-02-22 at a60fe69bce)\n + test-genzeros: avoid raw write(2)\n\n A test helper had a single write(2) of 256kB, which was too big for\n some platforms (e.g. NonStop), which has been corrected by using\n xwrite() wrapper appropriately.\n\n Will merge to 'master'.\n source: \n\n\n* jk/http-proxy-tests (2023-02-16) 1 commit\n (merged to 'next' on 2023-02-22 at f1f69d188f)\n + add basic http proxy tests\n\n Test updates.\n\n Will merge to 'master'.\n source: \n\n\n* ps/free-island-marks (2023-02-21) 1 commit\n (merged to 'next' on 2023-02-22 at f46938bce3)\n + delta-islands: fix segfault when freeing island marks\n\n Fix on a previous fix already in 'master'.\n\n Will merge to 'master'.\n source: <61e490595b80b34c55fd640e093e021ff6fa9591.1676542973.git.ps@pks.im>\n\n\n* tb/drop-dir-iterator-follow-symlink-bit (2023-02-16) 2 commits\n (merged to 'next' on 2023-02-22 at 785e1f323e)\n + t0066: drop setup of \"dir5\"\n + dir-iterator: drop unused `DIR_ITERATOR_FOLLOW_SYMLINKS`\n\n Remove leftover and unused code.\n\n Will merge to 'master'.\n source: <9bb10b607e46f867a3f8f5c71abf13c990d1ecfe.1676572031.git.me@ttaylorr.com>\n source: \n\n\n* jc/countermand-format-attach (2023-02-17) 1 commit\n - format.attach: allow empty value to disable multi-part messages\n\n The format.attach configuration variable lacked a way to override a\n value defined in a lower-priority configuration file (e.g. the\n system one) by redefining it in a higher-priority configuration\n file. Now, setting format.attach to an empty string means show the\n patch inline in the e-mail message, without using MIME attachment.\n\n This is a backward incompatible change.\n\n Will merge to 'next'?\n source: \n\n\n* rs/archive-mtime (2023-02-18) 1 commit\n - archive: add --mtime\n\n \"git archive HEAD^{tree}\" records the paths with the current\n timestamp in the archive, making it harder to obtain a stable\n output. The command learned the --mtime option to specify an\n arbitrary timestamp (e.g. --mtime=\"@0 +0000\" for the epoch).\n\n Will merge to 'next'?\n source: <91a73f5d-ca3e-6cb0-4ba3-38d703074ee6@web.de>\n\n\n* ap/t2015-style-update (2023-02-21) 1 commit\n (merged to 'next' on 2023-02-22 at 40883b85c7)\n + t2015-checkout-unborn.sh: changes the style for cd\n\n Test clean-up.\n\n Will merge to 'master'.\n source: <20230218192128.7963-1-ashutosh.pandeyhlr007@gmail.com>\n\n\n* if/simplify-trace-setup (2023-02-21) 1 commit\n - trace.c, git.c: remove unnecessary parameter to trace_repo_setup()\n\n Code clean-up.\n\n Will merge to 'next'?\n source: <20230219002527.84315-1-mcsm224@gmail.com>\n\n\n* ma/fetch-parallel-use-online-cpus (2023-02-21) 1 commit\n (merged to 'next' on 2023-02-22 at 756d379bf0)\n + fetch: choose a sensible default with --jobs=0 again\n\n \"git fetch --jobs=0\" used to hit a BUG(), which has been corrected\n to use the available CPUs.\n\n Will merge to 'master'.\n source: \n\n\n* pw/rebase-i-validate-labels-early (2023-02-21) 1 commit\n (merged to 'next' on 2023-02-22 at 9b37d42d24)\n + rebase -i: check labels and refs when parsing todo list\n\n An invalid label or ref in the \"rebase -i\" todo file used to\n trigger an runtime error. SUch an error is now diagnosed while the\n todo file is parsed.\n\n Will merge to 'master'.\n source: \n\n\n* tl/range-diff-custom-abbrev (2023-02-21) 1 commit\n (merged to 'next' on 2023-02-22 at 49db7cce13)\n + range-diff: let '--abbrev' option takes effect\n\n \"git range-diff\" learned --abbrev= option.\n\n Will merge to 'master'.\n source: <20230220142444.18739-2-tenglong.tl@alibaba-inc.com>\n\n--------------------------------------------------\n[Stalled]\n\n* ja/worktree-orphan (2023-01-13) 4 commits\n - worktree add: add hint to direct users towards --orphan\n - worktree add: add --orphan flag\n - worktree add: refactor opt exclusion tests\n - worktree add: include -B in usage docs\n\n 'git worktree add' learned how to create a worktree based on an\n orphaned branch with `--orphan`.\n\n Expecting a reroll.\n cf. <11be1b0e-ee38-119f-1d80-cb818946116b@dunelm.org.uk>\n source: <20230109173227.29264-1-jacobabel@nullpo.dev>\n\n\n* tl/notes--blankline (2023-02-16) 3 commits\n - notes.c: introduce \"--separator\" option\n - notes.c: cleanup for \"designated init\"\n - notes.c: cleanup 'strbuf_grow' call in 'append_edit'\n\n 'git notes append' was taught '--separator' to specify string to insert\n between paragraphs.\n source: \n\n\n* ab/tag-object-type-errors (2022-11-22) 5 commits\n - tag: don't emit potentially incorrect \"object is a X, not a Y\"\n - tag: don't misreport type of tagged objects in errors\n - object tests: add test for unexpected objects in tags\n - object-file.c: free the \"t.tag\" in check_tag()\n - Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors\n\n Hardening checks around mismatched object types when one of those\n objects is a tag.\n\n Expecting a reroll.\n cf. \n cf. \n source: \n\n\n* ed/fsmonitor-inotify (2022-12-13) 6 commits\n - fsmonitor: update doc for Linux\n - fsmonitor: test updates\n - fsmonitor: enable fsmonitor for Linux\n - fsmonitor: implement filesystem change listener for Linux\n - fsmonitor: determine if filesystem is local or remote\n - fsmonitor: prepare to share code between Mac OS and Linux\n\n Bundled fsmonitor for Linux using inotify API.\n\n Needs review on the updated round.\n source: \n\n\n* jc/spell-id-in-both-caps-in-message-id (2022-12-17) 1 commit\n - e-mail workflow: Message-ID is spelled with ID in both capital letters\n\n Consistently spell \"Message-ID\" as such, not \"Message-Id\".\n\n Needs review.\n source: \n\n\n* ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit\n - test-lib: allow storing counts with test harnesses\n\n Allow summary results from tests to be written to t/test-results\n directory even when a test harness like 'prove' is in use.\n\n Needs review.\n source: <20221224225200.1027806-1-adam@dinwoodie.org>\n\n\n* so/diff-merges-more (2022-12-18) 5 commits\n - diff-merges: improve --diff-merges documentation\n - diff-merges: issue warning on lone '-m' option\n - diff-merges: support list of values for --diff-merges\n - diff-merges: implement log.diffMerges-m-imply-p config\n - diff-merges: implement [no-]hide option and log.diffMergesHide config\n\n Assorted updates to \"--diff-merges=X\" option.\n\n May want to discard. Breaking compatibility does not seem worth it.\n source: <20221217132955.108542-1-sorganov@gmail.com>\n\n--------------------------------------------------\n[Cooking]\n\n* ew/commit-reach-clean-up-flags-fix (2023-02-11) 1 commit\n - commit-reach: avoid NULL dereference\n\n Under discussion.\n cf. <876cf920-113a-90cf-f49e-6e1b7b146acf@github.com>\n source: <20230211111526.2028178-1-e@80x24.org>\n\n\n* rs/ctype-test (2023-02-13) 3 commits\n (merged to 'next' on 2023-02-15 at 279f198dec)\n + test-ctype: test iscntrl, ispunct, isxdigit and isprint\n + test-ctype: test islower and isupper\n + test-ctype: test isascii\n\n Test safe_ctype\n\n Will merge to 'master'.\n source: <81eee04b-598e-dfe1-f954-3105bcbcb2f2@web.de>\n\n\n* mh/credential-password-expiry (2023-02-18) 1 commit\n - credential: new attribute password_expiry_utc\n\n The credential subsystem learned that a password may have an\n explicit expiration.\n\n Will merge to 'next'?\n source: \n\n\n* tk/pull-conflict-suggest-rebase-merge-not-rebase-true (2023-02-13) 1 commit\n - pull: conflict hint pull.rebase suggestion should offer \"merges\" vs \"true\"\n\n In an advice message after failed non-ff pull, we used to suggest\n setting pull.rebase=true, but these days pull.rebase=merges may be\n more inline with the original spirit of \"rebuild your side on top\n of theirs\".\n\n cf. \n source: \n\n\n* jc/gpg-lazy-init (2023-02-09) 1 commit\n - gpg-interface: lazily initialize and read the configuration\n\n Instead of forcing each command to choose to honor GPG related\n configuration variables, make the subsystem lazily initialize\n itself.\n\n Will merge to 'next'?\n source: \n\n\n* mc/credential-helper-www-authenticate (2023-02-16) 3 commits\n - credential: add WWW-Authenticate header to cred requests\n - http: read HTTP WWW-Authenticate response headers\n - t5563: add tests for basic and anoymous HTTP access\n\n Allow information carried on the WWW-AUthenticate header to be\n passed to the credential helpers.\n\n Will merge to 'next'?\n source: \n\n\n* ab/avoid-losing-exit-codes-in-tests (2023-02-06) 6 commits\n - tests: don't lose misc \"git\" exit codes\n - tests: don't lose exit status with \"test $(git ...)\"\n - tests: don't lose \"git\" exit codes in \"! ( git ... | grep )\"\n - tests: don't lose exit status with \"(cd ...; test $(git ...))\"\n - t/lib-patch-mode.sh: fix ignored exit codes\n - auto-crlf tests: don't lose exit code in loops and outside tests\n\n Test clean-up.\n\n Will merge to 'next'?\n source: \n\n\n* rj/branch-unborn-in-other-worktrees (2023-02-06) 3 commits\n - branch: rename orphan branches in any worktree\n - branch: description for orphan branch errors\n - branch: avoid unnecessary worktrees traversals\n\n Error messages given when working on an unborn branch that is\n checked out in another worktree have been improvved.\n\n Expecting a reroll.\n cf. <230207.86cz6l501v.gmgdl@evledraar.gmail.com>\n source: <2193a4ed-b263-068e-92f8-847dcb053f8c@gmail.com>\n\n\n* ab/imap-send-requires-curl (2023-02-02) 6 commits\n - imap-send: correctly report \"host\" when using \"tunnel\"\n - imap-send: remove old --no-curl codepath\n - imap-send: make --curl no-optional\n - imap-send: replace auto-probe libcurl with hard dependency\n - imap-send doc: the imap.sslVerify is used with imap.tunnel\n - imap-send: note \"auth_method\", not \"host\" on auth method failure\n\n Give a hard dependency on cURL library to build \"git imap-send\",\n and remove the code to interact with IMAP server without using cURL.\n\n Expecting a reroll.\n The 'tunnel' part is still iffy.\n cf. <230203.86bkmabfjr.gmgdl@evledraar.gmail.com>\n source: \n\n\n* rd/doc-default-date-format (2023-02-15) 1 commit\n (merged to 'next' on 2023-02-22 at 3818705ca9)\n + rev-list: clarify git-log default date format\n\n Update --date=default documentation.\n\n Will merge to 'master'.\n source: \n\n\n* ab/config-multi-and-nonbool (2023-02-07) 10 commits\n - for-each-repo: with bad config, don't conflate and \n - config API: add \"string\" version of *_value_multi(), fix segfaults\n - config API users: test for *_get_value_multi() segfaults\n - for-each-repo: error on bad --config\n - config API: don't lose the git_*get*() return values\n - config API: have *_multi() return an \"int\" and take a \"dest\"\n - versioncmp.c: refactor config reading next commit\n - config API: add and use a \"git_config_get()\" family of functions\n - config tests: add \"NULL\" tests for *_get_value_multi()\n - config tests: cover blind spots in git_die_config() tests\n\n Assorted config API updates.\n\n Will merge to 'next'?\n source: \n\n\n* cb/checkout-same-branch-twice (2023-01-20) 1 commit\n - checkout/switch: disallow checking out same branch in multiple worktrees\n\n \"git checkout -B $branch\" failed to protect against checking out\n a branch that is checked out elsewhere, unlike \"git branch -f\" did.\n\n Expecting a hopefully minor and final reroll.\n cf. <8f24fc3c-c30f-dc70-5a94-5ee4ed3de102@dunelm.org.uk>\n source: <20230120113553.24655-1-carenas@gmail.com>\n\n\n* rj/avoid-switching-to-already-used-branch (2023-01-22) 3 commits\n - switch: reject if the branch is already checked out elsewhere (test)\n - rebase: refuse to switch to a branch already checked out elsewhere (test)\n - branch: fix die_if_checked_out() when ignore_current_worktree\n\n A few subcommands have been taught to stop users from working on a\n branch that is being used in another worktree linked to the same\n repository.\n\n Expecting a hopefully minor and final reroll.\n cf. \n source: \n\n\n* rj/bisect-already-used-branch (2023-01-22) 1 commit\n - bisect: fix \"reset\" when branch is checked out elsewhere\n\n Allow \"git bisect reset [name]\" to check out the named branch (or\n the original one) even when the branch is already checked out in a\n different worktree linked to the same repository.\n\n Will merge to 'next'?\n source: <1c36c334-9f10-3859-c92f-3d889e226769@gmail.com>\n\n\n* ms/send-email-feed-header-to-validate-hook (2023-01-19) 2 commits\n - send-email: expose header information to git-send-email's sendemail-validate hook\n - send-email: refactor header generation functions\n\n \"git send-email\" learned to give the e-mail headers to the validate\n hook by passing an extra argument from the command line.\n\n Expecting a hopefully minor and final reroll.\n cf. \n source: <20230120012459.920932-1-michael.strawbridge@amd.com>\n\n\n* tc/cat-file-z-use-cquote (2023-01-16) 1 commit\n - cat-file: quote-format name in error when using -z\n\n \"cat-file\" in the batch mode that is fed NUL-terminated pathnames\n learned to cquote them in its error output (otherwise, a funny\n pathname with LF in it would break the lines in the output stream).\n\n Expecting a reroll.\n cf. <2a2a46f0-a9bc-06a6-72e1-28800518777c@dunelm.org.uk>\n source: <20230116190749.4141516-1-toon@iotcl.com>\n\n\n* cw/submodule-status-in-parallel (2023-02-09) 6 commits\n - diff-lib: parallelize run_diff_files for submodules\n - diff-lib: refactor out diff_change logic\n - submodule: refactor is_submodule_modified()\n - submodule: move status parsing into function\n - submodule: strbuf variable rename\n - run-command: add duplicate_output_fn to run_processes_parallel_opts\n\n \"git submodule status\" learned to run the comparison in submodule\n repositories in parallel.\n\n Not quite there yet...\n source: <20230209000212.1892457-1-calvinwan@google.com>\n\n--------------------------------------------------\n[Discarded]\n\n* mc/switch-advice (2022-11-09) 1 commit\n . po: use `switch` over `checkout` in error message\n\n Use 'switch' instead of 'checkout' in an error message.\n\n Will discard.\n Getting tired of waiting for review response.\n\n\n* js/range-diff-mbox (2022-11-23) 1 commit\n . range-diff: support reading mbox files\n\n 'git range-diff' gained support for reading either side from an .mbox\n file instead of a revision range.\n\n Will discard.\n Getting tired of waiting for review response.\n cf. \n source: \n\n\n* jc/test-prereq-symlink-update (2023-02-09) 1 commit\n . test: make SYMLINKS prerequisite more robust\n\n For some reason, \"ln -s x y && test -h y\" started passing on\n Windows, even though we do not have working readlink(3) there.\n Tighten the check to enable SYMLINKS prerequisite in our tests.\n\n It turns out that this was caused by using a faulty build of the\n Windows dev environment, which was fixed.\n source: \n\n\n* jc/t5559-workaround (2023-02-09) 1 commit\n . t5559: skip a known-to-be-broken test\n\n source: \n"},{"id":"472480","messageId":"3ab86863-fa15-a5c5-08c8-73ad775e04c8@github.com","threadId":"59291","inReplyTo":"xmqqbkllaxd7.fsf@gitster.g","subject":"mc/credential-helper-www-authenticate (Re: What's cooking in git.git (Feb 2023, #04; Wed, 22))","fromName":"Victoria Dye","fromEmail":"vdye@github.com","sentAt":"2023-02-23T05:51:28Z","receivedAt":"2023-02-23T05:51:34Z","isPatch":false,"sender":{"key":"vdye@github.com","avatar":"https://avatars.githubusercontent.com/u/3619353?v=4"},"body":"Junio C Hamano wrote:\n> * mc/credential-helper-www-authenticate (2023-02-16) 3 commits\n> - credential: add WWW-Authenticate header to cred requests\n> - http: read HTTP WWW-Authenticate response headers\n> - t5563: add tests for basic and anoymous HTTP access\n> \n> Allow information carried on the WWW-AUthenticate header to be\n> passed to the credential helpers.\n> \n> Will merge to 'next'?\n> source: \n\nAside from some relatively minor touch-ups, this has been fairly stable\nsince v8. I'm happy with it at this point, but I'm also curious to hear\nPeff's thoughts (since it was his review that prompted the switch to Apache\nfor the test helper, among other changes).\n\n"},{"id":"472524","messageId":"Y/c2dQTohGsN+3Me@coredump.intra.peff.net","threadId":"59291","inReplyTo":"3ab86863-fa15-a5c5-08c8-73ad775e04c8@github.com","subject":"Re: mc/credential-helper-www-authenticate (Re: What's cooking in git.git (Feb 2023, #04; Wed, 22))","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2023-02-23T09:48:37Z","receivedAt":"2023-02-23T09:48:42Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Feb 22, 2023 at 09:51:28PM -0800, Victoria Dye wrote:\n\n> Junio C Hamano wrote:\n> > * mc/credential-helper-www-authenticate (2023-02-16) 3 commits\n> > - credential: add WWW-Authenticate header to cred requests\n> > - http: read HTTP WWW-Authenticate response headers\n> > - t5563: add tests for basic and anoymous HTTP access\n> > \n> > Allow information carried on the WWW-AUthenticate header to be\n> > passed to the credential helpers.\n> > \n> > Will merge to 'next'?\n> > source: \n> \n> Aside from some relatively minor touch-ups, this has been fairly stable\n> since v8. I'm happy with it at this point, but I'm also curious to hear\n> Peff's thoughts (since it was his review that prompted the switch to Apache\n> for the test helper, among other changes).\n\nI just gave v10 a careful read. It looks quite nice to me, though there\nwere a few tiny nits that I think are worth a re-roll (the most\nimportant being the strcasecmp buffer over-read).\n\n-Peff\n"},{"id":"472577","messageId":"kl6lfsaw84vo.fsf@chooglen-macbookpro.roam.corp.google.com","threadId":"59291","inReplyTo":"xmqqbkllaxd7.fsf@gitster.g","subject":"ab/config-multi-and-nonbool (was Re: What's cooking in git.git (Feb 2023, #04; Wed, 22))","fromName":"Glen Choo","fromEmail":"chooglen@google.com","sentAt":"2023-02-23T21:10:35Z","receivedAt":"2023-02-23T21:11:12Z","isPatch":false,"sender":{"key":"glencbz@gmail.com","avatar":"https://avatars.githubusercontent.com/u/58092771?v=4"},"body":"Junio C Hamano writes:\n\n> * ab/config-multi-and-nonbool (2023-02-07) 10 commits\n> - for-each-repo: with bad config, don't conflate and \n> - config API: add \"string\" version of *_value_multi(), fix segfaults\n> - config API users: test for *_get_value_multi() segfaults\n> - for-each-repo: error on bad --config\n> - config API: don't lose the git_*get*() return values\n> - config API: have *_multi() return an \"int\" and take a \"dest\"\n> - versioncmp.c: refactor config reading next commit\n> - config API: add and use a \"git_config_get()\" family of functions\n> - config tests: add \"NULL\" tests for *_get_value_multi()\n> - config tests: cover blind spots in git_die_config() tests\n>\n> Assorted config API updates.\n>\n> Will merge to 'next'?\n> source: \n\nI would prefer to eject 06/10 [1] for now and leave it in for a future\ncleanup series. I haven't confirmed whether it's safe (the practical\neffect of that patch is that the *_get() functions can now return -1\ninstead of 1, so the patch is safe if all callers only check if the\nreturn value is zero, and not whether it has a particular sign), and I\ndon't think 06/10 is absolutely necessary to the series.\n\nBut if we are already quite convinced that this is safe, I have no\nobjections to merging it as-is.\n\n[1] https://lore.kernel.org/git/patch-v5-06.10-b515ff13f9b-20230207T154000Z-avarab@gmail.com\n"},{"id":"472581","messageId":"xmqqa61456ru.fsf@gitster.g","threadId":"59291","inReplyTo":"kl6lfsaw84vo.fsf@chooglen-macbookpro.roam.corp.google.com","subject":"Re: ab/config-multi-and-nonbool (was Re: What's cooking in git.git (Feb 2023, #04; Wed, 22))","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-02-23T22:57:57Z","receivedAt":"2023-02-23T22:58:04Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Glen Choo writes:\n\n> I would prefer to eject 06/10 [1] for now and leave it in for a future\n> cleanup series. I haven't confirmed whether it's safe (the practical\n> effect of that patch is that the *_get() functions can now return -1\n> instead of 1, so the patch is safe if all callers only check if the\n> return value is zero, and not whether it has a particular sign), and I\n> don't think 06/10 is absolutely necessary to the series.\n\nIf somebody wants to help auditing potential breakage the patch in\nquestion causes, \"are callers happy to declare an error upon\nnon-zero return?\" is not exactly sufficient. While all of these\nfunctions return 0 upon success, some of them return 1 on certain\ncases while error() on other cases, and we need to ensure that the\ncallers are not behaving differently upon these values.\n\nSo let's see how many functions does the patch in question touch.\n\n> diff --git a/config.c b/config.c\n> index 1f654daf6f..74d453f5f9 100644\n> --- a/config.c\n> +++ b/config.c\n> @@ -2449,86 +2449,93 @@ int git_configset_get(struct config_set *cs, const char *key)\n> int git_configset_get_string(struct config_set *cs, const char *key, char **dest)\n> {\n> \tconst char *value;\n> -\tif (!git_configset_get_value(cs, key, &value))\n> -\t\treturn git_config_string((const char **)dest, key, value);\n> -\telse\n> -\t\treturn 1;\n> +\tint ret;\n> +\n> +\tif ((ret = git_configset_get_value(cs, key, &value)))\n> +\t\treturn ret;\n> +\treturn git_config_string((const char **)dest, key, value);\n> }\n\nThis used to return 1 when there is no such value, and get whatever\nerror signal git_config_string() gave if git_config_string() failed.\n\nLuckily, git_configset_get_value() returns 1 when there is no such\nvalue, so I think this hunk is an expensive-to-audit no-op.\n\n> static int git_configset_get_string_tmp(struct config_set *cs, const char *key,\n> \t\t\t\t\tconst char **dest)\n> {\n> \tconst char *value;\n> -\tif (!git_configset_get_value(cs, key, &value)) {\n> -\t\tif (!value)\n> -\t\t\treturn config_error_nonbool(key);\n> -\t\t*dest = value;\n> -\t\treturn 0;\n> -\t} else {\n> -\t\treturn 1;\n> -\t}\n> +\tint ret;\n> +\n> +\tif ((ret = git_configset_get_value(cs, key, &value)))\n> +\t\treturn ret;\n> +\tif (!value)\n> +\t\treturn config_error_nonbool(key);\n> +\t*dest = value;\n> +\treturn 0;\n> }\n\nDitto.\n\n> int git_configset_get_int(struct config_set *cs, const char *key, int *dest)\n> {\n> \tconst char *value;\n> -\tif (!git_configset_get_value(cs, key, &value)) {\n> -\t\t*dest = git_config_int(key, value);\n> -\t\treturn 0;\n> -\t} else\n> -\t\treturn 1;\n> +\tint ret;\n> +\n> +\tif ((ret = git_configset_get_value(cs, key, &value)))\n> +\t\treturn ret;\n> +\t*dest = git_config_int(key, value);\n> +\treturn 0;\n> }\n\nDitto.\n\n> int git_configset_get_ulong(struct config_set *cs, const char *key, unsigned long *dest)\n> {\n> \tconst char *value;\n> -\tif (!git_configset_get_value(cs, key, &value)) {\n> -\t\t*dest = git_config_ulong(key, value);\n> -\t\treturn 0;\n> -\t} else\n> -\t\treturn 1;\n> +\tint ret;\n> +\n> +\tif ((ret = git_configset_get_value(cs, key, &value)))\n> +\t\treturn ret;\n> +\t*dest = git_config_ulong(key, value);\n> +\treturn 0;\n> }\n\nDitto.\n\n> int git_configset_get_bool(struct config_set *cs, const char *key, int *dest)\n> {\n> \tconst char *value;\n> -\tif (!git_configset_get_value(cs, key, &value)) {\n> -\t\t*dest = git_config_bool(key, value);\n> -\t\treturn 0;\n> -\t} else\n> -\t\treturn 1;\n> +\tint ret;\n> +\n> +\tif ((ret = git_configset_get_value(cs, key, &value)))\n> +\t\treturn ret;\n> +\t*dest = git_config_bool(key, value);\n> +\treturn 0;\n> }\n\nDitto.\n\n> int git_configset_get_bool_or_int(struct config_set *cs, const char *key,\n> \t\t\t\tint *is_bool, int *dest)\n> {\n> \tconst char *value;\n> -\tif (!git_configset_get_value(cs, key, &value)) {\n> -\t\t*dest = git_config_bool_or_int(key, value, is_bool);\n> -\t\treturn 0;\n> -\t} else\n> -\t\treturn 1;\n> +\tint ret;\n> +\n> +\tif ((ret = git_configset_get_value(cs, key, &value)))\n> +\t\treturn ret;\n> +\t*dest = git_config_bool_or_int(key, value, is_bool);\n> +\treturn 0;\n> }\n\nDitto.\n\n> int git_configset_get_maybe_bool(struct config_set *cs, const char *key, int *dest)\n> {\n> \tconst char *value;\n> -\tif (!git_configset_get_value(cs, key, &value)) {\n> -\t\t*dest = git_parse_maybe_bool(value);\n> -\t\tif (*dest == -1)\n> -\t\t\treturn -1;\n> -\t\treturn 0;\n> -\t} else\n> -\t\treturn 1;\n> +\tint ret;\n> +\n> +\tif ((ret = git_configset_get_value(cs, key, &value)))\n> +\t\treturn ret;\n> +\t*dest = git_parse_maybe_bool(value);\n> +\tif (*dest == -1)\n> +\t\treturn -1;\n> +\treturn 0;\n> }\n\nDitto.\n\n> int git_configset_get_pathname(struct config_set *cs, const char *key, const char **dest)\n> {\n> \tconst char *value;\n> -\tif (!git_configset_get_value(cs, key, &value))\n> -\t\treturn git_config_pathname(dest, key, value);\n> -\telse\n> -\t\treturn 1;\n> +\tint ret;\n> +\n> +\tif ((ret = git_configset_get_value(cs, key, &value)))\n> +\t\treturn ret;\n> +\treturn git_config_pathname(dest, key, value);\n> }\n\nDitto.\n\n> @@ -2775,9 +2782,11 @@ int git_config_get_expiry_in_days(const char *key, timestamp_t *expiry, timestam\n> \tconst char *expiry_string;\n> \tintmax_t days;\n> \ttimestamp_t when;\n> +\tint ret;\n> \n> -\tif (git_config_get_string_tmp(key, &expiry_string))\n> -\t\treturn 1; /* no such thing */\n> +\tif ((ret = git_config_get_string_tmp(key, &expiry_string)))\n> +\t\t/* no such thing, or git_config_parse_key() failure etc. */\n> +\t\treturn ret;\n\nThis was returning -1 for an error (at the end of the function), as\nwell as 1 for \"no such thing\". Now, this is a breaking change if\nany callers wanted to tell between -1 and 1.\n\nLuckily, I think its two callers discard the error return; they\ninitialize expiry to some reasonable default and rely on the fact\nthat the expiry is not updated when these configuration API calls\ndid not find anything interesting.\n\n> @@ -2827,15 +2837,14 @@ int git_config_get_index_threads(int *dest)\n\nYou can easily find output in \"git grep git_config_get_index_threads\"\nthat all four callers only care if they get 0 or not, so this one\nshould be safe.\n\n"},{"id":"472806","messageId":"AS2PR03MB98156E464D1FCEDA59348504C0AF9@AS2PR03MB9815.eurprd03.prod.outlook.com","threadId":"59291","inReplyTo":"Y/c2dQTohGsN+3Me@coredump.intra.peff.net","subject":"Re: mc/credential-helper-www-authenticate (Re: What's cooking in git.git (Feb 2023, #04; Wed, 22))","fromName":"Matthew John Cheetham","fromEmail":"mjcheetham@outlook.com","sentAt":"2023-02-27T17:19:15Z","receivedAt":"2023-02-27T17:19:30Z","isPatch":false,"sender":{"key":"mjcheetham@outlook.com","avatar":"https://avatars.githubusercontent.com/u/5658207?v=4"},"body":"On 2023-02-23 01:48, Jeff King wrote:\n\n> On Wed, Feb 22, 2023 at 09:51:28PM -0800, Victoria Dye wrote:\n> \n>> Junio C Hamano wrote:\n>>> * mc/credential-helper-www-authenticate (2023-02-16) 3 commits\n>>> - credential: add WWW-Authenticate header to cred requests\n>>> - http: read HTTP WWW-Authenticate response headers\n>>> - t5563: add tests for basic and anoymous HTTP access\n>>>\n>>> Allow information carried on the WWW-AUthenticate header to be\n>>> passed to the credential helpers.\n>>>\n>>> Will merge to 'next'?\n>>> source: \n>>\n>> Aside from some relatively minor touch-ups, this has been fairly stable\n>> since v8. I'm happy with it at this point, but I'm also curious to hear\n>> Peff's thoughts (since it was his review that prompted the switch to Apache\n>> for the test helper, among other changes).\n> \n> I just gave v10 a careful read. It looks quite nice to me, though there\n> were a few tiny nits that I think are worth a re-roll (the most\n> important being the strcasecmp buffer over-read).\n\nThanks for the thorough review all :)\n\n> -Peff\n"}]}