{"thread":{"id":"59888","subject":"What's cooking in git.git (Jun 2023, #05; Tue, 20)","startedAt":"2023-06-21T00:04:56Z","lastAt":"2023-06-24T01:25:59Z","messageCount":8,"participants":["Junio C Hamano","Jeff King","Elijah Newren"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"478607","messageId":"xmqqedm5k7dx.fsf@gitster.g","threadId":"59888","inReplyTo":null,"subject":"What's cooking in git.git (Jun 2023, #05; Tue, 20)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-06-21T00:04:42Z","receivedAt":"2023-06-21T00:04:56Z","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\nfuture release). Commits prefixed with '-' are only in 'seen', and\naren't considered \"accepted\" at all and may be annotated with an URL\nto a message that raises issues but they are no means exhaustive. A\ntopic without enough support may be discarded after a long period of\nno activity (of course they can be resubmit when new interests\narise).\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* jc/test-modernization (2023-05-19) 20 commits\n (merged to 'next' on 2023-06-15 at 811ac3f7ad)\n + t7101-reset-empty-subdirs: modernize test format\n + t6050-replace: modernize test format\n + t5306-pack-nobase: modernize test format\n + t5303-pack-corruption-resilience: modernize test format\n + t5301-sliding-window: modernize test format\n + t5300-pack-object: modernize test format\n + t4206-log-follow-harder-copies: modernize test format\n + t4202-log: modernize test format\n + t4004-diff-rename-symlink: modernize test format\n + t4003-diff-rename-1: modernize test format\n + t4002-diff-basic: modernize test format\n + t3903-stash: modernize test format\n + t3700-add: modernize test format\n + t3500-cherry: modernize test format\n + t1006-cat-file: modernize test format\n + t1002-read-tree-m-u-2way: modernize test format\n + t1001-read-tree-m-2way: modernize test format\n + t3210-pack-refs: modernize test format\n + t0030-stripspace: modernize test format\n + t0000-basic: modernize test format\n (this branch is used by jc/test-modernization-2.)\n\n Originally merged to 'next' on 2023-06-13\n source: \n\n\n* jc/test-modernization-2 (2023-05-23) 10 commits\n (merged to 'next' on 2023-06-15 at 01df673682)\n + t9400-git-cvsserver-server: modernize test format\n + t9200-git-cvsexportcommit: modernize test format\n + t9104-git-svn-follow-parent: modernize test format\n + t9100-git-svn-basic: modernize test format\n + t7700-repack: modernize test format\n + t7600-merge: modernize test format\n + t7508-status: modernize test format\n + t7201-co: modernize test format\n + t7111-reset-table: modernize test format\n + t7110-reset-merge: modernize test format\n (this branch uses jc/test-modernization.)\n\n Originally merged to 'next' on 2023-06-13\n\n Test style updates.\n source: \n\n\n* jk/ci-use-clang-for-sanitizer-jobs (2023-06-03) 3 commits\n (merged to 'next' on 2023-06-15 at 268459fc6a)\n + ci: drop linux-clang job\n + ci: run ASan/UBSan in a single job\n + ci: use clang for ASan/UBSan checks\n\n Originally merged to 'next' on 2023-06-12\n\n Clang's sanitizer implementation seems to work better than GCC's.\n source: <20230601180220.GA4167745@coredump.intra.peff.net>\n\n\n* jk/log-follow-with-non-literal-pathspec (2023-06-03) 3 commits\n (merged to 'next' on 2023-06-15 at 6848e0b8e6)\n + diff: detect pathspec magic not supported by --follow\n + diff: factor out --follow pathspec check\n + pathspec: factor out magic-to-name function\n\n Originally merged to 'next' on 2023-06-13\n\n \"git [-c log.follow=true] log [--follow] ':(glob)f**'\" used to barf.\n source: <20230601173724.GA4158369@coredump.intra.peff.net>\n\n\n* kh/use-default-notes-doc (2023-06-06) 2 commits\n (merged to 'next' on 2023-06-15 at f25ced157e)\n + notes: move the documentation to the struct\n + notes: update documentation for `use_default_notes`\n\n Originally merged to 'next' on 2023-06-13\n\n Doc update.\n source: \n\n\n* la/doc-interpret-trailers (2023-06-14) 9 commits\n (merged to 'next' on 2023-06-15 at 6ff4a2b913)\n + doc: trailer: add more examples in DESCRIPTION\n + doc: trailer: mention 'key' in DESCRIPTION\n + doc: trailer..command: emphasize deprecation\n + doc: trailer: use angle brackets for and \n + doc: trailer: remove redundant phrasing\n + doc: trailer: examples: avoid the word \"message\" by itself\n + doc: trailer: drop \"commit message part\" phrasing\n + doc: trailer: swap verb order\n + doc: trailer: fix grammar\n\n Originally merged to 'next' on 2023-06-14\n\n Doc update.\n source: \n\n\n* mh/commit-reach-get-reachable-plug-leak (2023-06-04) 1 commit\n (merged to 'next' on 2023-06-15 at 62e19d66fb)\n + commit-reach: fix memory leak in get_reachable_subset()\n\n Originally merged to 'next' on 2023-06-12\n\n Plug memory leak.\n source: <20230603002819.1122129-1-mh@glandium.org>\n\n\n* pb/complete-and-document-auto-merge-and-friends (2023-05-23) 6 commits\n (merged to 'next' on 2023-06-15 at ebe3216719)\n + completion: complete AUTO_MERGE\n + Documentation: document AUTO_MERGE\n + git-merge.txt: modernize word choice in \"True merge\" section\n + completion: complete REVERT_HEAD and BISECT_HEAD\n + revisions.txt: document more special refs\n + revisions.txt: use description list for special refs\n\n Originally merged to 'next' on 2023-06-13\n\n Document more pseudo-refs and teach the command line completion\n machinery to complete AUTO_MERGE.\n source: \n\n\n* ps/fetch-cleanups (2023-05-17) 9 commits\n (merged to 'next' on 2023-06-15 at 33878153a5)\n + fetch: use `fetch_config` to store \"submodule.fetchJobs\" value\n + fetch: use `fetch_config` to store \"fetch.parallel\" value\n + fetch: use `fetch_config` to store \"fetch.recurseSubmodules\" value\n + fetch: use `fetch_config` to store \"fetch.showForcedUpdates\" value\n + fetch: use `fetch_config` to store \"fetch.pruneTags\" value\n + fetch: use `fetch_config` to store \"fetch.prune\" value\n + fetch: pass through `fetch_config` directly\n + fetch: drop unneeded NULL-check for `remote_ref`\n + fetch: drop unused DISPLAY_FORMAT_UNKNOWN enum value\n\n Originally merged to 'next' on 2023-06-12\n\n Code clean-up.\n cf. <20230519002128.GD2442034@coredump.intra.peff.net>\n source: \n\n\n* tb/submodule-null-deref-fix (2023-05-25) 1 commit\n (merged to 'next' on 2023-06-15 at 8cb6a7710a)\n + builtin/submodule--helper.c: handle missing submodule URLs\n\n Originally merged to 'next' on 2023-06-13\n\n \"git submodule\" code trusted the data coming from the config (and\n the in-tree .gitmodules file) too much without validating, leading\n to NULL dereference if the user mucks with a repository (e.g.\n submodule..url is removed). This has been corrected.\n source: \n\n\n* tl/quote-problematic-arg-for-clarity (2023-06-03) 1 commit\n (merged to 'next' on 2023-06-15 at 4e52ad2fb3)\n + surround %s with quotes when failed to lookup commit\n\n Originally merged to 'next' on 2023-06-12\n\n Error message fix.\n source: <1f7c62a8870433792076fae30d6c4dc4b61a00d8.1685366301.git.dyroneteng@gmail.com>\n\n\n* tz/test-fix-pthreads-prereq (2023-05-26) 1 commit\n (merged to 'next' on 2023-06-15 at 2d2446ff97)\n + trace2 tests: fix PTHREADS prereq\n\n Originally merged to 'next' on 2023-06-12\n\n Test fix.\n source: <20230525031218.3554586-1-tmz@pobox.com>\n\n\n* tz/test-ssh-verifytime-fix (2023-05-26) 1 commit\n (merged to 'next' on 2023-06-15 at dd97dd32f3)\n + t/lib-gpg: fix ssh-keygen -Y check-novalidate with openssh-9.0\n\n Originally merged to 'next' on 2023-06-12\n\n Test fix.\n source: <20230525031026.3554406-1-tmz@pobox.com>\n\n\n* vd/worktree-config-is-per-repository (2023-05-26) 3 commits\n (merged to 'next' on 2023-06-15 at 6301770cd6)\n + repository: move 'repository_format_worktree_config' to repo scope\n + config: pass 'repo' directly to 'config_with_options()'\n + config: use gitdir to get worktree config\n\n Originally merged to 'next' on 2023-06-13\n\n The value of config.worktree is per-repository, but has been kept\n in a singleton global variable per process. This has been OK as\n most Git operations interacted with a single repository at a time,\n but not right for operations like recursive \"grep\" that want to\n access multiple repositories from a single process without forking.\n\n The global variable has been eliminated and made into a member in\n the per-repository data structure.\n cf. <3145f4f3-7bd4-8a1b-4943-11b7d22b60c6@github.com>\n cf. \n source: \n\n--------------------------------------------------\n[New Topics]\n\n* gc/discover-not-setup (2023-06-16) 1 commit\n (merged to 'next' on 2023-06-16 at 27d1cd2a1b)\n + setup.c: don't setup in discover_git_directory()\n\n discover_git_directory() no longer touches the_repository.\n\n Will merge to 'master'.\n source: \n\n\n* mh/credential-erase-improvements (2023-06-15) 2 commits\n (merged to 'next' on 2023-06-16 at 5a3ed25303)\n + credential: erase all matching credentials\n + credential: avoid erasing distinct password\n\n Will merge to 'master'.\n cf. <20230615212116.GA39325@coredump.intra.peff.net>\n source: \n\n\n* cc/repack-sift-filtered-objects-to-separate-pack (2023-06-14) 9 commits\n - gc: add `gc.repackFilterTo` config option\n - repack: implement `--filter-to` for storing filtered out objects\n - gc: add `gc.repackFilter` config option\n - repack: add `--filter=` option\n - repack: refactor finishing pack-objects command\n - repack: refactor piping an oid to a command\n - t/helper: add 'find-pack' test-tool\n - pack-objects: add `--print-filtered` to print omitted objects\n - pack-objects: allow `--filter` without `--stdout`\n\n \"git repack\" machinery learns to pay attention to the \"--filter=\"\n option.\n\n Needs review.\n source: <20230614192541.1599256-1-christian.couder@gmail.com>\n\n\n* js/cmake-wo-cache-h (2023-06-15) 1 commit\n (merged to 'next' on 2023-06-16 at b138273e7e)\n + cmake: adapt to `cache.h` being no more\n (this branch uses en/header-split-cache-h-part-3.)\n\n Build fix in en/header-split-cache-h-part-3 topic.\n\n Will merge to 'master'.\n source: \n\n\n* ps/revision-stdin-with-options (2023-06-15) 3 commits\n - revision: handle pseudo-opts in `--stdin` mode\n - revision: small readability improvement for reading from stdin\n - revision: reorder `read_revisions_from_stdin()`\n\n The set-up code for the get_revision() API now allows feeding\n options like --all and --not in the --stdin mode.\n\n Will merge to 'next'?\n source: \n\n\n* rs/doc-ls-tree-hex-literal (2023-06-15) 1 commit\n (merged to 'next' on 2023-06-16 at 472c7f55c9)\n + ls-tree: fix documentation of %x format placeholder\n\n Doc update.\n\n Will merge to 'master'.\n source: <23e54256-9ad5-e978-d0b8-abb511232fd1@web.de>\n\n\n* jk/commit-use-no-divider-with-interpret-trailers (2023-06-16) 1 commit\n (merged to 'next' on 2023-06-20 at 08e5f2a6b5)\n + commit: pass --no-divider to interpret-trailers\n\n When \"git commit --trailer=...\" invokes the interpret-trailers\n machinery, it knows what it feeds to interpret-trailers is a full\n log message without any patch, but failed to express that by\n passing the \"--no-divider\" option, which has been corrected.\n\n Will merge to 'master'.\n source: <20230617042624.GA562686@coredump.intra.peff.net>\n\n\n* jk/redact-h2h3-headers-fix (2023-06-17) 1 commit\n (merged to 'next' on 2023-06-20 at c1247fd527)\n + http: handle both \"h2\" and \"h2h3\" in curl info lines\n\n Curl library recently changed how http2 traces are shown and broke\n the code to redact sensitive info header, which has been fixed.\n\n Will merge to 'master'.\n source: <20230617051559.GD562686@coredump.intra.peff.net>\n\n\n* rs/strbuf-expand-step (2023-06-18) 5 commits\n - strbuf: simplify strbuf_expand_literal_cb()\n - replace strbuf_expand() with strbuf_expand_step()\n - replace strbuf_expand_dict_cb() with strbuf_expand_step()\n - strbuf: factor out strbuf_expand_step()\n - pretty: factor out expand_separator()\n\n Code clean-up around strbuf_expand() API.\n\n source: <767baa64-20a6-daf2-d34b-d81f72363749@web.de>\n\n--------------------------------------------------\n[Stalled]\n\n* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit\n - fsmonitor: handle differences between Windows named pipe functions\n\n Fix fsmonitor on Windows when the filesystem path contains certain\n characters.\n\n Expecting a reroll.\n cf. \n source: \n\n\n* rn/sparse-diff-index (2023-04-10) 1 commit\n - diff-index: enable sparse index\n\n \"git diff-index\" command has been taught to work better with the\n sparse index.\n\n Expecting a reroll.\n cf. <62821012-4fc3-5ad8-695c-70f7ab14a8c9@github.com>\n source: <20230408112342.404318-1-nanth.raghul@gmail.com>\n\n\n* es/recurse-submodules-option-is-a-bool (2023-04-10) 1 commit\n - usage: clarify --recurse-submodules as a boolean\n\n The \"--[no-]recurse-submodules\" option of \"git checkout\" and others\n supported an undocumented syntax --recurse-submodules= where\n the value can spell a Boolean in various ways. The support for the\n syntax is being dropped.\n\n Expecting a reroll.\n cf. \n source: \n\n\n* cb/checkout-same-branch-twice (2023-03-22) 2 commits\n - SQUASH??? the test marked to expect failure passes from day one\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. \n source: <20230120113553.24655-1-carenas@gmail.com>\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 May want to discard.\n This is too much of a departure from the existing practice.\n cf. \n cf. \n source: \n\n\n* ab/tag-object-type-errors (2023-05-10) 4 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 - 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 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 Expecting a reroll.\n cf. \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.\n Breaking compatibility does not seem worth it.\n source: <20221217132955.108542-1-sorganov@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* cw/submodule-status-in-parallel (2023-03-02) 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: rename strbuf variable\n - run-command: add on_stderr_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 Expecting a reroll.\n cf. \n cf. <230307.865ybc273g.gmgdl@evledraar.gmail.com>\n source: <20230302215237.1473444-1-calvinwan@google.com>\n\n--------------------------------------------------\n[Cooking]\n\n* js/doc-unit-tests (2023-06-13) 1 commit\n - unit tests: Add a project plan document\n\n Process to add some form of low-level unit tests has started.\n\n Comments? Filling in blanks?\n source: <8afdb215d7e10ca16a2ce8226b4127b3d8a2d971.1686352386.git.steadmon@google.com>\n\n\n* jt/doc-use-octal-with-printf (2023-06-14) 1 commit\n (merged to 'next' on 2023-06-16 at ebb72b9bd8)\n + CodingGuidelines: use octal escapes, not hex\n\n Suggest to refrain from using hex literals that are non-portable\n when writing printf(1) format strings.\n\n Will merge to 'master'.\n source: <20230614213145.475607-1-jonathantanmy@google.com>\n\n\n* js/defeat-ignore-submodules-config-with-explicit-addition (2023-06-14) 1 commit\n (merged to 'next' on 2023-06-16 at bfc01bd5e2)\n + diff-lib: honor override_submodule_config flag bit\n\n Even when diff.ignoreSubmodules tells us to ignore submodule\n changes, \"git commit\" with an index that already records changes to\n submodules should include the submodule changes in the resulting\n commit, but it did not.\n\n Will merge to 'master'.\n source: <20230614164856.3186012-2-sokcevic@google.com>\n\n\n* as/dtype-compilation-fix (2023-06-12) 1 commit\n (merged to 'next' on 2023-06-16 at 267100947e)\n + statinfo.h: move DTYPE defines from dir.h\n\n Compilation fix for platforms without D_TYPE in struct dirent.\n\n Will merge to 'master'.\n source: <20230606205935.3183276-1-asedeno@google.com>\n\n\n* la/docs-typofixes (2023-06-12) 1 commit\n (merged to 'next' on 2023-06-16 at 56ddcb16e6)\n + docs: typofixes\n\n Typofixes.\n\n Will merge to 'master'.\n source: \n\n\n* mh/mingw-case-sensitive-build (2023-06-12) 1 commit\n - mingw: use lowercase includes for some Windows headers\n\n Names of MinGW header files are spelled in mixed case in some\n source files, but the build host can be using case sensitive\n filesystem with header files with their name spelled in all\n lowercase.\n\n Needs review.\n source: <20230604211934.1365289-1-mh@glandium.org>\n\n\n* pb/complete-diff-options (2023-06-12) 25 commits\n - diff.c: mention completion above add_diff_options\n - completion: complete --remerge-diff\n - completion: complete --diff-merges, its options and --no-diff-merges\n - completion: move --pickaxe-{all,regex} to __git_diff_common_options\n - completion: complete --ws-error-highlight\n - completion: complete --unified\n - completion: complete --patch-with-raw\n - completion: complete --output-indicator-{context,new,old}\n - completion: complete --output\n - completion: complete --no-stat\n - completion: complete --no-relative\n - completion: complete --line-prefix\n - completion: complete --ita-invisible-in-index and --ita-visible-in-index\n - completion: complete --irreversible-delete\n - completion: complete --ignore-matching-lines\n - completion: complete --function-context\n - completion: complete --find-renames\n - completion: complete --find-object\n - completion: complete --find-copies\n - completion: complete --default-prefix\n - completion: complete --compact-summary\n - completion: complete --combined-all-paths\n - completion: complete --cc\n - completion: complete --break-rewrites\n - completion: add comments describing __git_diff_* globals\n\n Completion updates.\n\n Expecting a reroll.\n cf. <5cba334c-4d75-0dac-20c6-9e3def1f224a@gmail.com>\n source: \n\n\n* rj/leakfixes (2023-06-17) 11 commits\n (merged to 'next' on 2023-06-17 at 49e54a88e2)\n + tests: mark as passing with SANITIZE=leak\n + config: fix a leak in git_config_copy_or_rename_section_in_file\n + branch: fix a leak in cmd_branch\n + branch: fix a leak in setup_tracking\n + rev-parse: fix a leak with --abbrev-ref\n (merged to 'next' on 2023-06-16 at d9330ea230)\n + branch: fix a leak in setup_tracking\n + branch: fix a leak in check_tracking_branch\n + branch: fix a leak in inherit_tracking\n + branch: fix a leak in dwim_and_setup_tracking\n + remote: fix a leak in query_matches_negative_refspec\n + config: fix a leak in git_config_copy_or_rename_section_in_file\n\n Leakfixes\n\n Will merge to 'master'.\n source: <71b49be1-eeef-2f60-38f1-cfcbe4c8252f@gmail.com>\n source: <9eb931e7-dd18-8ce8-4d4a-cf3d85066189@gmail.com>\n\n\n* rs/run-command-exec-error-on-noent (2023-06-12) 2 commits\n (merged to 'next' on 2023-06-16 at 6bb4425334)\n + run-command: report exec error even on ENOENT\n + t1800: loosen matching of error message for bad shebang\n\n Simplify error message when run-command fails to start a command.\n\n Will merge to 'master'.\n source: <14e1be60-3765-0ba5-00f5-2848bb57bf53@web.de>\n\n\n* sl/worktree-sparse (2023-06-12) 1 commit\n (merged to 'next' on 2023-06-16 at ca0a7edcc5)\n + worktree: integrate with sparse-index\n\n \"git worktree\" learned to work better with sparse index feature.\n\n Will merge to 'master'.\n source: <20230606172633.669916-1-cheskaqiqi@gmail.com>\n\n\n* tb/collect-pack-filenames-fix (2023-06-12) 1 commit\n (merged to 'next' on 2023-06-20 at abcc6892c8)\n + builtin/repack.c: only collect fully-formed packs\n\n Avoid breakage of \"git pack-objects --cruft\" due to inconsistency\n between the way the code enumerates packfiles in the repository.\n\n Will merge to 'master'.\n source: <20230607101617.ges6tnMry4E52lDGld43QgtNUsIS4YQq6w-t71hEfkQ@z>\n\n\n* tb/open-midx-bitmap-fallback (2023-06-12) 1 commit\n (merged to 'next' on 2023-06-16 at 6546fee734)\n + pack-bitmap.c: gracefully degrade on failure to load MIDX'd pack\n\n Gracefully deal with a stale MIDX file that lists a packfile that\n no longer exists.\n\n Will merge to 'master'.\n source: \n\n\n* tz/lib-gpg-prereq-fix (2023-06-12) 1 commit\n (merged to 'next' on 2023-06-16 at 19770e970a)\n + t/lib-gpg: require GPGSSH for GPGSSH_VERIFYTIME prereq\n\n Test update.\n\n Will merge to 'master'.\n source: <20230606214707.55739-1-tmz@pobox.com>\n\n\n* ps/cat-file-null-output (2023-06-12) 5 commits\n (merged to 'next' on 2023-06-15 at e841ad2be5)\n + cat-file: add option '-Z' that delimits input and output with NUL\n + cat-file: simplify reading from standard input\n + strbuf: provide CRLF-aware helper to read until a specified delimiter\n + t1006: modernize test style to use `test_cmp`\n + t1006: don't strip timestamps from expected results\n\n \"git cat-file --batch\" and friends learned \"-Z\" that uses NUL\n delimiter for both input and output.\n\n Will merge to 'master'.\n source: \n\n\n* ds/add-i-color-configuration-fix (2023-06-12) 2 commits\n (merged to 'next' on 2023-06-15 at 377b9f9a00)\n + add: test use of brackets when color is disabled\n + add: check color.ui for interactive add\n\n The reimplemented \"git add -i\" did not honor color.ui configuration.\n\n Will merge to 'master'.\n source: \n\n\n* ks/ref-filter-signature (2023-06-06) 2 commits\n - ref-filter: add new \"signature\" atom\n - t/lib-gpg: introduce new prereq GPG2\n\n The \"git for-each-ref\" family of commands learned placeholders\n related to GPG signature verification.\n\n Needs review.\n source: <20230604185815.15761-1-five231003@gmail.com>\n\n\n* ds/disable-replace-refs (2023-06-12) 3 commits\n (merged to 'next' on 2023-06-15 at e7baddb745)\n + repository: create read_replace_refs setting\n + replace-objects: create wrapper around setting\n + repository: create disable_replace_refs()\n (this branch uses tb/pack-bitmap-traversal-with-boundary.)\n\n Introduce a mechanism to disable replace refs globally and per\n repository.\n\n Will merge to 'master'.\n source: \n\n\n* jt/path-filter-fix (2023-06-13) 4 commits\n - commit-graph: new filter ver. that fixes murmur3\n - repo-settings: introduce commitgraph.changedPathsVersion\n - t4216: test changed path filters with high bit paths\n - gitformat-commit-graph: describe version 2 of BDAT\n\n The Bloom filter used for path limited history traversal was broken\n on systems whose \"char\" is unsigned; update the implementation and\n bump the format version to 2.\n\n Expecting a reroll.\n cf. \n source: \n\n\n* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit\n - cherry-pick: refuse cherry-pick sequence if index is dirty\n\n \"git cherry-pick A\" that replays a single commit stopped before\n clobbering local modification, but \"git cherry-pick A..B\" did not,\n which has been corrected.\n\n Expecting a reroll.\n cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>\n source: \n\n\n* mh/credential-libsecret-attrs (2023-06-16) 1 commit\n - credential/libsecret: store new attributes\n\n The way authentication related data other than passwords (e.g.\n oath token and password expiration data) are stored in libsecret\n keyrings has been rethought.\n\n Needs review.\n source: \n\n\n* ja/worktree-orphan (2023-05-17) 8 commits\n (merged to 'next' on 2023-06-15 at 16bb552b79)\n + worktree add: emit warn when there is a bad HEAD\n + worktree add: extend DWIM to infer --orphan\n + worktree add: introduce \"try --orphan\" hint\n + worktree add: add --orphan flag\n + t2400: add tests to verify --quiet\n + t2400: refactor \"worktree add\" opt exclusion tests\n + t2400: cleanup created worktree in test\n + worktree add: include -B in usage docs\n\n Originally merged to 'next' on 2023-06-14\n\n 'git worktree add' learned how to create a worktree based on an\n orphaned branch with `--orphan`.\n\n Will merge to 'master'.\n source: <20230517214711.12467-1-jacobabel@nullpo.dev>\n\n\n* tb/refs-exclusion-and-packed-refs (2023-06-20) 16 commits\n - ls-refs.c: avoid enumerating hidden refs where possible\n - upload-pack.c: avoid enumerating hidden refs where possible\n - builtin/receive-pack.c: avoid enumerating hidden references\n - refs.h: let `for_each_namespaced_ref()` take excluded patterns\n - refs/packed-backend.c: ignore complicated hidden refs rules\n - revision.h: store hidden refs in a `strvec`\n - refs/packed-backend.c: add trace2 counters for jump list\n - refs/packed-backend.c: implement jump lists to avoid excluded pattern(s)\n - refs/packed-backend.c: refactor `find_reference_location()`\n - refs: plumb `exclude_patterns` argument throughout\n - builtin/for-each-ref.c: add `--exclude` option\n - ref-filter.c: parameterize match functions over patterns\n - ref-filter: add `ref_filter_clear()`\n - ref-filter: clear reachable list pointers after freeing\n - ref-filter.h: provide `REF_FILTER_INIT`\n - refs.c: rename `ref_filter`\n\n Enumerating refs in the packed-refs file, while excluding refs that\n match certain patterns, has been optimized.\n\n source: \n\n\n* en/header-split-cache-h-part-3 (2023-05-16) 29 commits\n (merged to 'next' on 2023-06-15 at 76ebce0b7a)\n + fsmonitor-ll.h: split this header out of fsmonitor.h\n + hash-ll, hashmap: move oidhash() to hash-ll\n + object-store-ll.h: split this header out of object-store.h\n + khash: name the structs that khash declares\n + merge-ll: rename from ll-merge\n + git-compat-util.h: remove unneccessary include of wildmatch.h\n + builtin.h: remove unneccessary includes\n + list-objects-filter-options.h: remove unneccessary include\n + diff.h: remove unnecessary include of oidset.h\n + repository: remove unnecessary include of path.h\n + log-tree: replace include of revision.h with simple forward declaration\n + cache.h: remove this no-longer-used header\n + read-cache*.h: move declarations for read-cache.c functions from cache.h\n + repository.h: move declaration of the_index from cache.h\n + merge.h: move declarations for merge.c from cache.h\n + diff.h: move declaration for global in diff.c from cache.h\n + preload-index.h: move declarations for preload-index.c from elsewhere\n + sparse-index.h: move declarations for sparse-index.c from cache.h\n + name-hash.h: move declarations for name-hash.c from cache.h\n + run-command.h: move declarations for run-command.c from cache.h\n + statinfo: move stat_{data,validity} functions from cache/read-cache\n + read-cache: move shared add/checkout/commit code\n + add: modify add_files_to_cache() to avoid globals\n + read-cache: move shared commit and ls-files code\n + setup: adopt shared init-db & clone code\n + init-db, clone: change unnecessary global into passed parameter\n + init-db: remove unnecessary global variable\n + init-db: document existing bug with core.bare in template config\n + Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-part-3\n (this branch is used by js/cmake-wo-cache-h.)\n\n Originally merged to 'next' on 2023-06-13\n\n Header files cleanup.\n\n Will merge to 'master' together with its fix-up in js/cmake-wo-cache-h\n source: \n\n\n* cc/git-replay (2023-06-03) 15 commits\n - replay: stop assuming replayed branches do not diverge\n - replay: add --contained to rebase contained branches\n - replay: add --advance or 'cherry-pick' mode\n - replay: disallow revision specific options and pathspecs\n - replay: use standard revision ranges\n - replay: make it a minimal server side command\n - replay: remove HEAD related sanity check\n - replay: remove progress and info output\n - replay: add an important FIXME comment about gpg signing\n - replay: don't simplify history\n - replay: introduce pick_regular_commit()\n - replay: die() instead of failing assert()\n - replay: start using parse_options API\n - replay: introduce new builtin\n - t6429: remove switching aspects of fast-rebase\n\n source: <20230602102533.876905-1-christian.couder@gmail.com>\n\n\n* tb/gc-recent-object-hook (2023-06-12) 2 commits\n (merged to 'next' on 2023-06-16 at 2d8d8ea2ef)\n + gc: introduce `gc.recentObjectsHook`\n + reachable.c: extract `obj_is_recent()`\n\n \"git pack-objects\" learned to invoke a new hook program that\n enumerates extra objects to be used as anchoring points to keep\n otherwise unreachable objects in cruft packs.\n\n Will merge to 'master'.\n source: \n\n\n* ob/revert-of-revert (2023-05-05) 1 commit\n - sequencer: beautify subject of reverts of reverts\n\n Instead of \"Revert \"Revert \"original\"\", give \"Reapply \"original\"\"\n as the title for a revert of a revert.\n\n Expecting a hopefully final reroll.\n Looking much better, except for minor cosmetic issues.\n source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de>\n\n\n* cw/strbuf-cleanup (2023-06-12) 7 commits\n - strbuf: remove global variable\n - path: move related function to path\n - object-name: move related functions to object-name\n - credential-store: move related functions to credential-store file\n - abspath: move related functions to abspath\n - strbuf: clarify dependency\n - strbuf: clarify API boundary\n\n Move functions that are not about pure string manipulation out of\n strbuf.[ch]\n source: <20230606194720.2053551-1-calvinwan@google.com>\n\n\n* tl/notes-separator (2023-04-28) 6 commits\n - notes.c: introduce \"--[no-]stripspace\" option\n - notes.c: append separator instead of insert by pos\n - notes.c: introduce '--separator=' option\n - t3321: add test cases about the notes stripspace behavior\n - notes.c: use designated initializers for clarity\n - notes.c: cleanup 'strbuf_grow' call in 'append_edit'\n (this branch is used by jc/notes-separator-fix.)\n\n 'git notes append' was taught '--separator' to specify string to insert\n between paragraphs.\n\n Expecting a reroll.\n cf. <20230615071314.GC1460739@coredump.intra.peff.net>\n source: \n\n\n* jc/notes-separator-fix (2023-06-13) 1 commit\n - notes: do not access before the beginning of an array\n (this branch uses tl/notes-separator.)\n\n Fix to tl/notes-separator topic.\n\n Will drop once tl/notes-separator gets updated.\n source: \n\n\n* pw/rebase-i-after-failure (2023-04-21) 6 commits\n - rebase -i: fix adding failed command to the todo list\n - rebase: fix rewritten list for failed pick\n - rebase --continue: refuse to commit after failed command\n - sequencer: factor out part of pick_commits()\n - rebase -i: remove patch file after conflict resolution\n - rebase -i: move unlink() calls\n\n Various fixes to the behaviour of \"rebase -i\" when the command got\n interrupted by conflicting changes.\n\n Expecting a reroll.\n cf. \n cf. <1fd54422-b66a-c2e4-7cd7-934ea01190ad@gmail.com>\n source: \n\n\n* tb/pack-bitmap-traversal-with-boundary (2023-05-08) 3 commits\n + pack-bitmap.c: use commit boundary during bitmap traversal\n + pack-bitmap.c: extract `fill_in_bitmap()`\n + object: add object_array initializer helper function\n (this branch is used by ds/disable-replace-refs.)\n\n Originally merged to 'next' on 2023-06-15\n\n The object traversal using reachability bitmap done by\n \"pack-object\" has been tweaked to take advantage of the fact that\n using \"boundary\" commits as representative of all the uninteresting\n ones can save quite a lot of object enumeration.\n\n Will merge to 'master'.\n source: \n\n--------------------------------------------------\n[Discarded]\n\n* mh/credential-password-expiry-libsecret (2023-05-05) 1 commit\n . credential/libsecret: support password_expiry_utc\n\n Originally merged to 'next' on 2023-05-09\n\n The libsecret credential helper learns to handle the password\n expiry time information.\n\n Superseded by mh/credential-libsecret-attrs.\n cf. \n source: \n\n\n* tb/pack-bitmap-index-seek (2023-03-20) 6 commits\n . pack-bitmap.c: factor out `bitmap_index_seek_commit()`\n . pack-bitmap.c: use `bitmap_index_seek()` where possible\n . pack-bitmap.c: factor out manual `map_pos` manipulation\n . pack-bitmap.c: drop unnecessary 'inline's\n . pack-bitmap.c: hide bitmap internals in `read_be32()`\n . pack-bitmap.c: hide bitmap internals in `read_u8()`\n\n Clean-up the pack-bitmap codepath.\n\n Retracted for now.\n cf. \n source: \n"},{"id":"478616","messageId":"20230621085526.GA920315@coredump.intra.peff.net","threadId":"59888","inReplyTo":"xmqqedm5k7dx.fsf@gitster.g","subject":"bug in en/header-split-cache-h-part-3, was Re: What's cooking in git.git (Jun 2023, #05; Tue, 20)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2023-06-21T08:55:26Z","receivedAt":"2023-06-21T08:57:52Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Jun 20, 2023 at 05:04:42PM -0700, Junio C Hamano wrote:\n\n> * en/header-split-cache-h-part-3 (2023-05-16) 29 commits\n> (merged to 'next' on 2023-06-15 at 76ebce0b7a)\n> + fsmonitor-ll.h: split this header out of fsmonitor.h\n> + hash-ll, hashmap: move oidhash() to hash-ll\n> + object-store-ll.h: split this header out of object-store.h\n> + khash: name the structs that khash declares\n> + merge-ll: rename from ll-merge\n> + git-compat-util.h: remove unneccessary include of wildmatch.h\n> + builtin.h: remove unneccessary includes\n> + list-objects-filter-options.h: remove unneccessary include\n> + diff.h: remove unnecessary include of oidset.h\n> + repository: remove unnecessary include of path.h\n> + log-tree: replace include of revision.h with simple forward declaration\n> + cache.h: remove this no-longer-used header\n> + read-cache*.h: move declarations for read-cache.c functions from cache.h\n> + repository.h: move declaration of the_index from cache.h\n> + merge.h: move declarations for merge.c from cache.h\n> + diff.h: move declaration for global in diff.c from cache.h\n> + preload-index.h: move declarations for preload-index.c from elsewhere\n> + sparse-index.h: move declarations for sparse-index.c from cache.h\n> + name-hash.h: move declarations for name-hash.c from cache.h\n> + run-command.h: move declarations for run-command.c from cache.h\n> + statinfo: move stat_{data,validity} functions from cache/read-cache\n> + read-cache: move shared add/checkout/commit code\n> + add: modify add_files_to_cache() to avoid globals\n> + read-cache: move shared commit and ls-files code\n> + setup: adopt shared init-db & clone code\n> + init-db, clone: change unnecessary global into passed parameter\n> + init-db: remove unnecessary global variable\n> + init-db: document existing bug with core.bare in template config\n> + Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-part-3\n> (this branch is used by js/cmake-wo-cache-h.)\n> \n> Originally merged to 'next' on 2023-06-13\n> \n> Header files cleanup.\n> \n> Will merge to 'master' together with its fix-up in js/cmake-wo-cache-h\n> source: \n\nI think this series has a bug with finding the correct templates dir. If\nI check out 76ebce0b7a (Merge branch 'en/header-split-cache-h-part-3'\ninto next, 2023-06-15) and run:\n\n make prefix=/tmp/foo install && /tmp/foo/bin/git init /tmp/bar\n\nI get:\n\n warning: templates not found in /usr/share/git-core/templates\n\nWhereas if I go to 76ebce0b7a^, that warning does not appear (and\npresumably the templates come from /tmp/foo/share, but I didn't check).\n\nOur tests can't notice because they always specify the in-repo template\ndir directly in the bin-wrappers script (and other users might not even\nget the warning if they have another git installed in /usr; it would\njust silently use the wrong template).\n\n Side note: I'm using the merge along 'next' there because much to my\n surprise, the tip of en/header-split-cache-h-part-3 does not build by\n itself! It needs the evil merge result from ccd12a3d6c (Merge branch\n 'en/header-split-cache-h-part-2', 2023-05-09). I wonder if it got\n applied on the wrong base. It does work when merged to 'next' (and\n should with 'master' as well), but it hurts bisectability.\n\nAfter rebasing on 'master' to make it buildable on its own, I bisected\nmy make/init command above, which shows the template problem appearing\nin 3f85c72fad (setup: adopt shared init-db & clone code, 2023-05-16).\n\nI guess the problem is the movement of the code from init-db.c to\nsetup.c, and we'd want something like this:\n\ndiff --git a/Makefile b/Makefile\nindex e440728c24..b09c8165d0 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -2742,8 +2742,8 @@ exec-cmd.sp exec-cmd.s exec-cmd.o: EXTRA_CPPFLAGS = \\\n \t'-DBINDIR=\"$(bindir_relative_SQ)\"' \\\n \t'-DFALLBACK_RUNTIME_PREFIX=\"$(prefix_SQ)\"'\n \n-builtin/init-db.sp builtin/init-db.s builtin/init-db.o: GIT-PREFIX\n-builtin/init-db.sp builtin/init-db.s builtin/init-db.o: EXTRA_CPPFLAGS = \\\n+setup.sp setup.s setup.o: GIT-PREFIX\n+setup.sp setup.s setup.o: EXTRA_CPPFLAGS = \\\n \t-DDEFAULT_GIT_TEMPLATE_DIR='\"$(template_dir_SQ)\"'\n \n config.sp config.s config.o: GIT-PREFIX\n\n\nIt does make me wonder if we should also just do this:\n\ndiff --git a/setup.c b/setup.c\nindex f8e1296766..6e7282e680 100644\n--- a/setup.c\n+++ b/setup.c\n@@ -1718,10 +1718,6 @@ int daemonize(void)\n #endif\n }\n \n-#ifndef DEFAULT_GIT_TEMPLATE_DIR\n-#define DEFAULT_GIT_TEMPLATE_DIR \"/usr/share/git-core/templates\"\n-#endif\n-\n #ifdef NO_TRUSTABLE_FILEMODE\n #define TEST_FILEMODE 0\n #else\n\nSince the Makefile always provides that value, having a baked-in\nfallback does not make much sense. And in this case it masked a real bug\nwhich should have been a compilation error, and instead silently used\nthe wrong value.\n\nSo I think we'd at least want to fix the Makefile before graduating this\ntopic any further. But IMHO it would also be worth adjusting the topic's\nstart point so that we don't have a big chunk of commits which fail to\nbuild in the final history.\n\n-Peff\n"},{"id":"478649","messageId":"xmqqttv0hhjv.fsf@gitster.g","threadId":"59888","inReplyTo":"20230621085526.GA920315@coredump.intra.peff.net","subject":"Re: bug in en/header-split-cache-h-part-3, was Re: What's cooking in git.git (Jun 2023, #05; Tue, 20)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-06-21T17:05:40Z","receivedAt":"2023-06-21T17:05:49Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> On Tue, Jun 20, 2023 at 05:04:42PM -0700, Junio C Hamano wrote:\n>\n>> * en/header-split-cache-h-part-3 (2023-05-16) 29 commits\n>> ...\n>> Will merge to 'master' together with its fix-up in js/cmake-wo-cache-h\n>> source: \n>\n> I think this series has a bug with finding the correct templates dir. If\n> I check out 76ebce0b7a (Merge branch 'en/header-split-cache-h-part-3'\n> into next, 2023-06-15) and run:\n>\n> make prefix=/tmp/foo install && /tmp/foo/bin/git init /tmp/bar\n>\n> I get:\n>\n> warning: templates not found in /usr/share/git-core/templates\n>\n> Whereas if I go to 76ebce0b7a^, that warning does not appear (and\n> presumably the templates come from /tmp/foo/share, but I didn't check).\n\nOuch.\n\n> Our tests can't notice because they always specify the in-repo template\n> dir directly in the bin-wrappers script (and other users might not even\n> get the warning if they have another git installed in /usr; it would\n> just silently use the wrong template).\n>\n> Side note: I'm using the merge along 'next' there because much to my\n> surprise, the tip of en/header-split-cache-h-part-3 does not build by\n> itself! It needs the evil merge result from ccd12a3d6c (Merge branch\n> 'en/header-split-cache-h-part-2', 2023-05-09). I wonder if it got\n> applied on the wrong base. It does work when merged to 'next' (and\n> should with 'master' as well), but it hurts bisectability.\n>\n> After rebasing on 'master' to make it buildable on its own, I bisected\n> my make/init command above, which shows the template problem appearing\n> in 3f85c72fad (setup: adopt shared init-db & clone code, 2023-05-16).\n>\n> I guess the problem is the movement of the code from init-db.c to\n> setup.c, and we'd want something like this:\n>\n> diff --git a/Makefile b/Makefile\n> index e440728c24..b09c8165d0 100644\n> --- a/Makefile\n> +++ b/Makefile\n> @@ -2742,8 +2742,8 @@ exec-cmd.sp exec-cmd.s exec-cmd.o: EXTRA_CPPFLAGS = \\\n> \t'-DBINDIR=\"$(bindir_relative_SQ)\"' \\\n> \t'-DFALLBACK_RUNTIME_PREFIX=\"$(prefix_SQ)\"'\n> \n> -builtin/init-db.sp builtin/init-db.s builtin/init-db.o: GIT-PREFIX\n> -builtin/init-db.sp builtin/init-db.s builtin/init-db.o: EXTRA_CPPFLAGS = \\\n> +setup.sp setup.s setup.o: GIT-PREFIX\n> +setup.sp setup.s setup.o: EXTRA_CPPFLAGS = \\\n> \t-DDEFAULT_GIT_TEMPLATE_DIR='\"$(template_dir_SQ)\"'\n> \n> config.sp config.s config.o: GIT-PREFIX\n>\n>\n> It does make me wonder if we should also just do this:\n>\n> diff --git a/setup.c b/setup.c\n> index f8e1296766..6e7282e680 100644\n> --- a/setup.c\n> +++ b/setup.c\n> @@ -1718,10 +1718,6 @@ int daemonize(void)\n> #endif\n> }\n> \n> -#ifndef DEFAULT_GIT_TEMPLATE_DIR\n> -#define DEFAULT_GIT_TEMPLATE_DIR \"/usr/share/git-core/templates\"\n> -#endif\n> -\n> #ifdef NO_TRUSTABLE_FILEMODE\n> #define TEST_FILEMODE 0\n> #else\n>\n> Since the Makefile always provides that value, having a baked-in\n> fallback does not make much sense. And in this case it masked a real bug\n> which should have been a compilation error, and instead silently used\n> the wrong value.\n>\n> So I think we'd at least want to fix the Makefile before graduating this\n> topic any further. But IMHO it would also be worth adjusting the topic's\n> start point so that we don't have a big chunk of commits which fail to\n> build in the final history.\n\nHmph, meaning (1) revert the merge of the topic to 'next', (2)\nrebase the topic on top of the current 'master', instead of 4bd872e0,\nwhich was a merge of the prerequisite series into then-current\nmaster, (3) apply the Makefile (plus setup.c) fix, and then (4)\nmerge the result back to 'next'?\n\n"},{"id":"478662","messageId":"20230621202642.GA1423@coredump.intra.peff.net","threadId":"59888","inReplyTo":"xmqqttv0hhjv.fsf@gitster.g","subject":"Re: bug in en/header-split-cache-h-part-3, was Re: What's cooking in git.git (Jun 2023, #05; Tue, 20)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2023-06-21T20:26:42Z","receivedAt":"2023-06-21T20:27:01Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Jun 21, 2023 at 10:05:40AM -0700, Junio C Hamano wrote:\n\n> > So I think we'd at least want to fix the Makefile before graduating this\n> > topic any further. But IMHO it would also be worth adjusting the topic's\n> > start point so that we don't have a big chunk of commits which fail to\n> > build in the final history.\n> \n> Hmph, meaning (1) revert the merge of the topic to 'next', (2)\n> rebase the topic on top of the current 'master', instead of 4bd872e0,\n> which was a merge of the prerequisite series into then-current\n> master, (3) apply the Makefile (plus setup.c) fix, and then (4)\n> merge the result back to 'next'?\n\nYeah. I guess the real build problem is actually in the merge of split-2\n(it conflicted with a simultaneous topic, hence the fix coming in the\nmerge). So another option to address that here would be to amend the\n4bd872e0ed (Merge branch 'en/header-split-cache-h-part-2' into\nen/header-split-cache-h-part-3, 2023-05-08) to include that fixup.\n\nAs for the others, I'd consider:\n\n 1. (optional) Drop the #ifndef at the very start of the series, before\n we touch anything, with the rationale that it is not doing anything\n and masks errors. I don't _think_ this can ever backfire, because\n we unconditionally set DEFAULT_GIT_TEMPLATE_DIR (unlike some other\n things like DEFAULT_PAGER, where the Makefile might leave it\n unset). But we can also leave this out, or do it as a separate\n topic, if we want to minimize changes / risk of screwing something\n up.\n\n 2. Squash the Makefile fix into the \"adopt shared init-db\" patch\n (currently 0d652b238).\n\nAnd that would leave the result fully bisectable. But if we prefer to\nkeep the history closer to reality, I can prepare the Makefile thing as\na patch on top.\n\n-Peff\n"},{"id":"478669","messageId":"xmqqjzvwfp6f.fsf@gitster.g","threadId":"59888","inReplyTo":"20230621202642.GA1423@coredump.intra.peff.net","subject":"Re: bug in en/header-split-cache-h-part-3, was Re: What's cooking in git.git (Jun 2023, #05; Tue, 20)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-06-21T22:03:52Z","receivedAt":"2023-06-21T22:04:00Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> Yeah. I guess the real build problem is actually in the merge of split-2\n> (it conflicted with a simultaneous topic, hence the fix coming in the\n> merge). So another option to address that here would be to amend the\n> 4bd872e0ed (Merge branch 'en/header-split-cache-h-part-2' into\n> en/header-split-cache-h-part-3, 2023-05-08) to include that fixup.\n>\n> As for the others, I'd consider:\n>\n> 1. (optional) Drop the #ifndef at the very start of the series, before\n> we touch anything, with the rationale that it is not doing anything\n> and masks errors. I don't _think_ this can ever backfire, because\n> we unconditionally set DEFAULT_GIT_TEMPLATE_DIR (unlike some other\n> things like DEFAULT_PAGER, where the Makefile might leave it\n> unset). But we can also leave this out, or do it as a separate\n> topic, if we want to minimize changes / risk of screwing something\n> up.\n>\n> 2. Squash the Makefile fix into the \"adopt shared init-db\" patch\n> (currently 0d652b238).\n>\n> And that would leave the result fully bisectable. But if we prefer to\n> keep the history closer to reality, I can prepare the Makefile thing as\n> a patch on top.\n\nI've done the messiest, I guess ;-)\n\n * revert merge of the part-3 topic and Dscho's cmake fix out of 'next'.\n\n * rebase part-3 on top of the more recent 'master'.\n\n * squash in the two hunks (including setup.c change) from you into\n the \"setup: adopt shared init-db & clone code\" step.\n\n * squash in Dscho's cmake fix into \"cache.h: remove this\n no-longer-used header\" step.\n\nThe result is not in 'next' yet until I hear something from those\nwho have been involved in the topic, including Elijah and Dscho.\n\nThanks.\n"},{"id":"478721","messageId":"CABPp-BEQ0_UfUbdeFetCsvAnpO_=mvmjQk8JS0trKJtCL=uh1A@mail.gmail.com","threadId":"59888","inReplyTo":"xmqqjzvwfp6f.fsf@gitster.g","subject":"Re: bug in en/header-split-cache-h-part-3, was Re: What's cooking in git.git (Jun 2023, #05; Tue, 20)","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2023-06-23T06:33:24Z","receivedAt":"2023-06-23T06:33:44Z","isPatch":false,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"On Wed, Jun 21, 2023 at 3:03 PM Junio C Hamano wrote:\n>\n> Jeff King writes:\n>\n> > Yeah. I guess the real build problem is actually in the merge of split-2\n> > (it conflicted with a simultaneous topic, hence the fix coming in the\n> > merge). So another option to address that here would be to amend the\n> > 4bd872e0ed (Merge branch 'en/header-split-cache-h-part-2' into\n> > en/header-split-cache-h-part-3, 2023-05-08) to include that fixup.\n> >\n> > As for the others, I'd consider:\n> >\n> > 1. (optional) Drop the #ifndef at the very start of the series, before\n> > we touch anything, with the rationale that it is not doing anything\n> > and masks errors. I don't _think_ this can ever backfire, because\n> > we unconditionally set DEFAULT_GIT_TEMPLATE_DIR (unlike some other\n> > things like DEFAULT_PAGER, where the Makefile might leave it\n> > unset). But we can also leave this out, or do it as a separate\n> > topic, if we want to minimize changes / risk of screwing something\n> > up.\n> >\n> > 2. Squash the Makefile fix into the \"adopt shared init-db\" patch\n> > (currently 0d652b238).\n> >\n> > And that would leave the result fully bisectable. But if we prefer to\n> > keep the history closer to reality, I can prepare the Makefile thing as\n> > a patch on top.\n>\n> I've done the messiest, I guess ;-)\n>\n> * revert merge of the part-3 topic and Dscho's cmake fix out of 'next'.\n>\n> * rebase part-3 on top of the more recent 'master'.\n>\n> * squash in the two hunks (including setup.c change) from you into\n> the \"setup: adopt shared init-db & clone code\" step.\n>\n> * squash in Dscho's cmake fix into \"cache.h: remove this\n> no-longer-used header\" step.\n>\n> The result is not in 'next' yet until I hear something from those\n> who have been involved in the topic, including Elijah and Dscho.\n\nI did a range-diff to compare my original series to your newly rebased\none, and read through all the differences (including Dscho's and\nPeff's suggested changes, as well as the various slight adjustments\ndue to rebasing). I also rebuilt every patch in your rebase of the\nseries to ensure they all build, and ran all tests on a couple of the\npatches to verify the pass (I didn't run all tests for each patch,\nbecause I did that for my original series and the differences in the\nrange-diff suggested I only needed to spot check all the tests).\n\nAnyway, your rebase of en/header-split-cache-h-part-3, including\nDscho's and Peff's changes, all look good to me.\n\nThanks everyone!\n"},{"id":"478735","messageId":"xmqqr0q2b0cw.fsf@gitster.g","threadId":"59888","inReplyTo":"CABPp-BEQ0_UfUbdeFetCsvAnpO_=mvmjQk8JS0trKJtCL=uh1A@mail.gmail.com","subject":"Re: bug in en/header-split-cache-h-part-3, was Re: What's cooking in git.git (Jun 2023, #05; Tue, 20)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-06-23T16:38:07Z","receivedAt":"2023-06-23T16:38:27Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Elijah Newren writes:\n\n> Anyway, your rebase of en/header-split-cache-h-part-3, including\n> Dscho's and Peff's changes, all look good to me.\n>\n> Thanks everyone!\n\nThanks for confirming. Let's merge it down to 'next' then.\n"},{"id":"478761","messageId":"20230624012555.GD95358@coredump.intra.peff.net","threadId":"59888","inReplyTo":"xmqqr0q2b0cw.fsf@gitster.g","subject":"Re: bug in en/header-split-cache-h-part-3, was Re: What's cooking in git.git (Jun 2023, #05; Tue, 20)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2023-06-24T01:25:55Z","receivedAt":"2023-06-24T01:25:59Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Jun 23, 2023 at 09:38:07AM -0700, Junio C Hamano wrote:\n\n> Elijah Newren writes:\n> \n> > Anyway, your rebase of en/header-split-cache-h-part-3, including\n> > Dscho's and Peff's changes, all look good to me.\n> >\n> > Thanks everyone!\n> \n> Thanks for confirming. Let's merge it down to 'next' then.\n\nI did a range-diff between en/header-split-cache-h-part-3{1} and the\ncurrent tip, and the changes look good to me. It might have been worth\nmentioning the #ifndef changes in the commit message for e8cf8ef507\n(setup: adopt shared init-db & clone code, 2023-05-16). But I see you\nmerged to 'next', and I don't think it's worth going back to change it\nagain.\n\nIt's nice when we can get everything in there, but I find that it's not\nuncommon to sometimes dig extra details out of the list archive if I\ndon't understand part of a change when doing archaeology.\n\n-Peff\n"}]}