{"thread":{"id":"58214","subject":"What's cooking in git.git (Jul 2022, #07; Fri, 22)","startedAt":"2022-07-23T01:01:24Z","lastAt":"2022-07-27T19:20:06Z","messageCount":9,"participants":["Junio C Hamano","Elijah Newren","Matheus Tavares","Taylor Blau","Derrick Stolee","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"459809","messageId":"xmqqh738bq21.fsf@gitster.g","threadId":"58214","inReplyTo":null,"subject":"What's cooking in git.git (Jul 2022, #07; Fri, 22)","fromName":"Junio C Hamano","fromEmail":"junio@pobox.com","sentAt":"2022-07-23T01:01:10Z","receivedAt":"2022-07-23T01:01:24Z","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',\nand aren't considered \"accepted\" at all.\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* gc/bare-repo-discovery (2022-07-14) 5 commits\n (merged to 'next' on 2022-07-15 at 5206577852)\n + setup.c: create `safe.bareRepository`\n + safe.directory: use git_protected_config()\n + config: learn `git_protected_config()`\n + Documentation: define protected configuration\n + Documentation/git-config.txt: add SCOPES section\n\n Introduce a discovery.barerepository configuration variable that\n allows users to forbid discovery of bare repositories.\n source: \n\n\n* js/ci-github-workflow-markup (2022-07-14) 1 commit\n (merged to 'next' on 2022-07-15 at 196166f671)\n + tests: fix incorrect --write-junit-xml code\n\n A fix for a regression in test framework.\n source: \n\n\n* js/shortlog-sort-stably (2022-07-14) 1 commit\n (merged to 'next' on 2022-07-15 at 75e4efe678)\n + shortlog: use a stable sort\n\n \"git shortlog -n\" relied on the underlying qsort() to be stable,\n which shouldn't have. Fixed.\n source: \n\n\n* js/vimdiff-quotepath-fix (2022-07-14) 1 commit\n (merged to 'next' on 2022-07-15 at 4273bbd4b4)\n + mergetool(vimdiff): allow paths to contain spaces again\n\n Variable quoting fix in the vimdiff driver of \"git mergetool\"\n source: \n\n\n* rs/mingw-tighten-mkstemp (2022-07-14) 1 commit\n (merged to 'next' on 2022-07-15 at 4dd4a117ec)\n + mingw: avoid mktemp() in mkstemp() implementation\n\n mkstemp() emulation on Windows has been improved.\n source: <7265e37f-fd29-3579-b840-19a1df52a59f@web.de>\n\n--------------------------------------------------\n[New Topics]\n\n* ab/leak-check (2022-07-20) 14 commits\n - CI: use \"GIT_TEST_SANITIZE_LEAK_LOG=true\" in linux-leaks\n - upload-pack: fix a memory leak in create_pack_file()\n - leak tests: mark passing SANITIZE=leak tests as leak-free\n - test-lib: have the \"check\" mode for SANITIZE=leak consider leak logs\n - test-lib: add a GIT_TEST_PASSING_SANITIZE_LEAK=check mode\n - test-lib: simplify by removing test_external\n - tests: move copy/pasted PERL + Test::More checks to a lib-perl.sh\n - t/Makefile: don't remove test-results in \"clean-except-prove-cache\"\n - test-lib: add a SANITIZE=leak logging mode\n - t/README: reword the \"GIT_TEST_PASSING_SANITIZE_LEAK\" description\n - test-lib: add a --invert-exit-code switch\n - test-lib: fix GIT_EXIT_OK logic errors, use BAIL_OUT\n - test-lib: don't set GIT_EXIT_OK before calling test_atexit_handler\n - test-lib: use $1, not $@ in test_known_broken_{ok,failure}_\n\n Plugging more leaks.\n source: \n\n\n* mb/p4-fixes (2022-07-20) 2 commits\n (merged to 'next' on 2022-07-20 at 7942d72b1c)\n + git-p4: fix error handling in P4Unshelve.renameBranch()\n + git-p4: fix typo in P4Submit.applyCommit()\n\n Fix a few issues in \"git p4\".\n\n Will merge to 'master'.\n source: \n\n\n* mb/p4-utf16-crlf (2022-07-20) 1 commit\n (merged to 'next' on 2022-07-20 at c2fedd2fc2)\n + git-p4: fix CR LF handling for utf16 files\n\n \"git p4\" working on UTF-16 files on Windows did not implement\n CRLF-to-LF conversion correctly, which has been corrected.\n\n Will merge to 'master'.\n source: \n\n\n* jc/string-list-cleanup (2022-07-20) 1 commit\n - builtin/remote.c: use the right kind of STRING_LIST_INIT\n\n Code clean-up.\n\n Will merge to 'next'.\n source: \n\n\n* mt/pkt-line-comment-tweak (2022-07-22) 1 commit\n (merged to 'next' on 2022-07-22 at 4004fa75eb)\n + pkt-line.h: move comment closer to the associated code\n\n In-code comment clarification.\n\n Will merge to 'master'.\n source: <6a14443c101fa132498297af6d7a483520688d75.1658488203.git.matheus.bernardino@usp.br>\n\n\n* mt/rot13-in-c (2022-07-22) 3 commits\n - t/t0021: replace old rot13-filter.pl uses with new test-tool cmd\n - t/t0021: convert the rot13-filter.pl script to C\n - Merge branch 'mt/checkout-count-fix' into mt/rot13-in-c\n (this branch uses mt/checkout-count-fix.)\n\n Test portability improvements.\n\n Needs review.\n source: \n\n\n* tk/untracked-cache-with-uall (2022-07-22) 1 commit\n - read-cache: make `do_read_index()` always set up `istate->repo`\n\n Fix for a bug that makes write-tree to faile to write out a\n non-existent index as a tree, introduced in 2.37.\n\n Will merge to 'next'.\n source: <20220722212232.833188-1-martin.agren@gmail.com>\n\n--------------------------------------------------\n[Stalled]\n\n* tk/apply-case-insensitive (2022-06-21) 3 commits\n - apply: support case-only renames in case-insensitive filesystems\n - reset: new failing test for reset of case-insensitive duplicate in index\n - t4141: test \"git apply\" with core.ignorecase\n\n \"git apply\" barfed on a patch that makes a case-only rename on a\n case-insensitive filesystem.\n\n Needs review.\n source: \n\n\n* bc/stash-export (2022-04-08) 4 commits\n - builtin/stash: provide a way to import stashes from a ref\n - builtin/stash: provide a way to export stashes to a ref\n - builtin/stash: factor out revision parsing into a function\n - object-name: make get_oid quietly return an error\n\n A mechanism to export and import stash entries to and from a normal\n commit to transfer it across repositories has been introduced.\n\n Expecting a reroll.\n cf. \n source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>\n\n\n* cw/remote-object-info (2022-05-06) 11 commits\n - SQUASH??? coccicheck\n - SQUASH??? ensure that coccicheck is happy\n - SQUASH??? compilation fix\n - cat-file: add --batch-command remote-object-info command\n - cat-file: move parse_cmd and DEFAULT_FORMAT up\n - transport: add object-info fallback to fetch\n - transport: add client side capability to request object-info\n - object-info: send attribute packet regardless of object ids\n - object-store: add function to free object_info contents\n - fetch-pack: move fetch default settings\n - fetch-pack: refactor packet writing\n\n A client component to talk with the object-info endpoint.\n\n Expecting a reroll.\n source: <20220502170904.2770649-1-calvinwan@google.com>\n\n--------------------------------------------------\n[Cooking]\n\n* ds/midx-with-less-memory (2022-07-19) 3 commits\n (merged to 'next' on 2022-07-20 at 250d257c3e)\n + midx: reduce memory pressure while writing bitmaps\n + midx: extract bitmap write setup\n + pack-bitmap-write: use const for hashes\n\n The codepath to write multi-pack index has been taught to release a\n large chunk of memory that holds an array of objects in the packs,\n as soon as it is done with the array, to reduce memory consumption.\n\n Will merge to 'master'.\n source: \n\n\n* ma/sparse-checkout-cone-doc-fix (2022-07-18) 1 commit\n (merged to 'next' on 2022-07-19 at c259b61b0e)\n + config/core.txt: fix minor issues for `core.sparseCheckoutCone`\n\n Docfix.\n\n Will merge to 'master'.\n source: <20220718100530.2068354-1-martin.agren@gmail.com>\n\n\n* ma/t4200-update (2022-07-18) 1 commit\n (merged to 'next' on 2022-07-19 at 710d0cafd9)\n + t4200: drop irrelevant code\n\n Test fix.\n\n Will merge to 'master'.\n source: <20220718154322.2177166-1-martin.agren@gmail.com>\n\n\n* mb/config-document-include (2022-07-17) 1 commit\n (merged to 'next' on 2022-07-19 at 8267b80aa2)\n + config.txt: document include, includeIf\n\n Add missing documentation for \"include\" and \"includeIf\" features in\n \"git config\" file format, which incidentally teachs the command\n line completion to include them in its offerings.\n\n Will merge to 'master'.\n source: \n\n\n* sg/index-format-doc-update (2022-07-18) 1 commit\n (merged to 'next' on 2022-07-19 at ccc384be5e)\n + index-format.txt: remove outdated list of supported extensions\n\n Docfix.\n\n Will merge to 'master'.\n source: <20220718085640.7395-1-szeder.dev@gmail.com>\n\n\n* tl/pack-bitmap-error-messages (2022-07-18) 6 commits\n (merged to 'next' on 2022-07-19 at 3f9565653a)\n + pack-bitmap.c: continue looping when first MIDX bitmap is found\n + pack-bitmap.c: using error() instead of silently returning -1\n + pack-bitmap.c: do not ignore error when opening a bitmap file\n + pack-bitmap.c: rename \"idx_name\" to \"bitmap_name\"\n + pack-bitmap.c: mark more strings for translations\n + pack-bitmap.c: fix formatting of error messages\n\n Tweak various messages that come from the pack-bitmap codepaths.\n\n Will merge to 'master'.\n source: \n\n\n* tl/trace2-config-scope (2022-07-22) 2 commits\n - tr2: shows scope unconditionally in addition to key-value pair\n - api-trace2.txt: print config key-value pair\n\n Tweak trace2 output about configuration variables.\n\n Will merge to 'next'?\n source: \n\n\n* vd/scalar-doc (2022-07-18) 2 commits\n (merged to 'next' on 2022-07-20 at fab0234da4)\n + scalar: convert README.md into a technical design doc\n + scalar: reword command documentation to clarify purpose\n\n Doc update.\n\n Will merge to 'master'.\n source: \n\n\n* cl/rerere-train-with-no-sign (2022-07-19) 1 commit\n (merged to 'next' on 2022-07-20 at fbb9414d09)\n + contrib/rerere-train: avoid useless gpg sign in training\n\n \"rerere-train\" script (in contrib/) used to honor commit.gpgSign\n while recreating the throw-away merges.\n\n Will merge to 'master'.\n source: \n\n\n* ds/win-syslog-compiler-fix (2022-07-19) 1 commit\n (merged to 'next' on 2022-07-20 at d38b649b18)\n + compat/win32: correct for incorrect compiler warning\n\n Workaround for a false positive compiler warning.\n\n Will merge to 'master'.\n source: \n\n\n* ld/osx-keychain-usage-fix (2022-07-19) 1 commit\n (merged to 'next' on 2022-07-20 at eebd316ef6)\n + osx-keychain: fix compiler warning\n\n Workaround for a compiler warning against use of die() in\n osx-keychain (in contrib/).\n\n Will merge to 'master'.\n source: \n\n\n* ab/submodule-helper-leakfix (2022-07-21) 26 commits\n - submodule--helper: fix a configure_added_submodule() leak\n - submodule--helper: fix bad config API usage\n - submodule--helper: free rest of \"displaypath\" in \"struct update_data\"\n - submodule--helper: don't exit() on failure, return\n - submodule--helper: add skeleton \"goto cleanup\" to update_submodule()\n - submodule--helper: rename \"int res\" to \"int ret\"\n - submodule--helper: free some \"displaypath\" in \"struct update_data\"\n - submodule--helper: fix a memory leak in print_status()\n - submodule--helper: fix a leak in module_add()\n - submodule--helper: fix obscure leak in module_add()\n - submodule--helper: fix \"reference\" leak is \"module_clone_data\"\n - submodule--helper: fix a memory leak in get_default_remote_submodule()\n - submodule--helper: fix a leak with repo_clear()\n - submodule--helper: fix \"sm_path\" and other \"module_cb_list\" leaks\n - submodule--helper: fix \"errmsg_str\" memory leak\n - submodule--helper: refactor \"errmsg_str\" to be a \"struct strbuf\"\n - submodule--helper: add and use *_release() functions\n - submodule--helper: add \"const\" to copy of \"update_data\"\n - submodule--helper: don't leak {run,capture}_command() cp.dir argument\n - submodule--helper: \"struct pathspec\" memory leak in module_update()\n - submodule--helper: fix most \"struct pathspec\" memory leaks\n - submodule--helper: fix trivial get_default_remote_submodule() leak\n - submodule--helper: fix a leak in \"clone_submodule\"\n - submodule--helper: pass a \"const struct module_clone_data\" to clone_submodule()\n - submodule--helper: stop conflating \"sb\" in clone_submodule()\n - submodule--helper: replace memset() with { 0 }-initialization\n\n Plugging leaks in submodule--helper.\n\n Getting there.\n source: \n\n\n* mt/doc-config (2022-07-14) 3 commits\n - doc: notes: unify configuration variables definitions\n - doc: apply: unify configuration variables definitions\n - doc: grep: unify configuration variables definitions\n\n Unify description of configuration variables used by individual\n commands in the documentation of the commands and the documentation\n of the \"git config\".\n\n Will discard (Retracted?).\n cf. \n source: \n\n\n* jt/fetch-pack-trace2-filter-spec (2022-07-18) 1 commit\n - fetch-pack: write effective filter to trace2\n\n \"git fetch\" client logs the partial clone filter used in the trace2\n output.\n\n Will merge to 'next'?\n source: <20220718170027.3993042-1-jonathantanmy@google.com>\n\n\n* mb/doc-rerere-autoupdate (2022-07-15) 1 commit\n - cherry-pick doc: clarify no-rerere-autoupdate still allows rerere\n\n Clarifies that the \"--no-rerere-autoupdate\" option does not disable\n the \"rerere\" mechanism (nor does \"--rerere-autoupdate\" enable it).\n\n Will merge to 'next'?\n source: <20220715092527.1567837-1-mail@beyermatthias.de>\n\n\n* rs/mergesort (2022-07-17) 10 commits\n - mergesort: remove llist_mergesort()\n - packfile: use DEFINE_LIST_SORT\n - fetch-pack: use DEFINE_LIST_SORT\n - commit: use DEFINE_LIST_SORT\n - blame: use DEFINE_LIST_SORT\n - test-mergesort: use DEFINE_LIST_SORT\n - test-mergesort: use DEFINE_LIST_SORT_DEBUG\n - mergesort: add macros for typed sort of linked lists\n - mergesort: tighten merge loop\n - mergesort: unify ranks loops\n\n Make our mergesort implementation type-safe.\n\n Will merge to 'next'?\n source: <4d7cd286-398e-215c-f2bd-aa7e8207be4f@web.de>\n\n\n* cw/submodule-merge-messages (2022-07-18) 1 commit\n - submodule merge: update conflict error message\n\n Update the message given when \"git merge\" sees conflicts at a path\n with a submodule while merging a superproject.\n\n Needs review.\n source: <20220718214349.3379328-1-calvinwan@google.com>\n\n\n* ds/doc-wo-whitelist (2022-07-19) 5 commits\n (merged to 'next' on 2022-07-20 at ec51c6269a)\n + transport.c: avoid \"whitelist\"\n + t: avoid \"whitelist\"\n + git.txt: remove redundant language\n + git-cvsserver: clarify directory list\n + daemon: clarify directory arguments\n\n Avoid \"white/black-list\" in documentation and code comments.\n\n Will merge to 'master'.\n source: \n\n\n* mt/checkout-count-fix (2022-07-14) 3 commits\n (merged to 'next' on 2022-07-22 at 60c73a6b0b)\n + checkout: fix two bugs on the final count of updated entries\n + checkout: show bug about failed entries being included in final report\n + checkout: document bug where delayed checkout counts entries twice\n (this branch is used by mt/rot13-in-c.)\n\n \"git checkout\" miscounted the paths it updated, which has been\n corrected.\n\n Will merge to 'master'.\n source: \n\n\n* tb/commit-graph-genv2-upgrade-fix (2022-07-15) 3 commits\n - commit-graph: fix corrupt upgrade from generation v1 to v2\n - commit-graph: introduce `repo_find_commit_pos_in_graph()`\n - t5318: demonstrate commit-graph generation v2 corruption\n\n There was a bug in the codepath to upgrade generation information\n in commit-graph from v1 to v2 format, which has been corrected.\n\n Will merge to 'next'?\n source: \n\n\n* js/safe-directory-plus (2022-07-13) 3 commits\n - mingw: be more informative when ownership check fails on FAT32\n - mingw: handle a file owned by the Administrators group correctly\n - Allow debugging unsafe directories' ownership\n\n Needs review.\n source: \n\n\n* po/doc-add-renormalize (2022-07-09) 1 commit\n - doc add: renormalize is not idempotent for CRCRLF\n\n Documentation for \"git add --renormalize\" has been improved.\n\n Expecting a reroll.\n cf. \n source: \n\n\n* po/glossary-around-traversal (2022-07-09) 3 commits\n - glossary: add reachability bitmap description\n - glossary: add commit graph description\n - glossary: add Object DataBase (ODB) abbreviation\n\n The glossary entries for \"commit-graph file\" and \"reachability\n bitmap\" have been added.\n\n Expecting a reroll.\n cf. \n source: \n\n\n* ac/bitmap-lookup-table (2022-07-20) 6 commits\n - bitmap-lookup-table: add performance tests for lookup table\n - p5310-pack-bitmaps.sh: enable `pack.writeReverseIndex`\n - pack-bitmap: prepare to read lookup table extension\n - pack-bitmap-write: learn pack.writeBitmapLookupTable and add tests\n - pack-bitmap-write.c: write lookup table extension\n - Documentation/technical: describe bitmap lookup table extension\n\n The pack bitmap file gained a bitmap-lookup table to speed up\n locating the necessary bitmap for a given commit.\n\n Waiting for a more thorough review.\n cf. \n source: \n\n\n* kk/p4-client-name-encoding-fix (2022-07-21) 2 commits\n (merged to 'next' on 2022-07-21 at 008518b4e5)\n + git-p4: refactoring of p4CmdList()\n (merged to 'next' on 2022-07-11 at 9c18616f76)\n + git-p4: fix bug with encoding of p4 client name\n\n \"git p4\" did not handle non-ASCII client name well, which has been\n corrected.\n\n Will merge to 'master'.\n source: \n\n\n* sa/cat-file-mailmap (2022-07-18) 4 commits\n - cat-file: add mailmap support\n - ident: rename commit_rewrite_person() to apply_mailmap_to_header()\n - ident: move commit_rewrite_person() to ident.c\n - revision: improve commit_rewrite_person()\n\n \"git cat-file\" learned an option to use the mailmap when showing\n commit and tag objects.\n\n Will merge to 'next'?\n source: <20220718195102.66321-1-siddharthasthana31@gmail.com>\n\n\n* ds/rebase-update-ref (2022-07-19) 13 commits\n (merged to 'next' on 2022-07-20 at 9f4bf9ef6c)\n + sequencer: notify user of --update-refs activity\n + sequencer: ignore HEAD ref under --update-refs\n + rebase: add rebase.updateRefs config option\n + sequencer: rewrite update-refs as user edits todo list\n + rebase: update refs from 'update-ref' commands\n + rebase: add --update-refs option\n + sequencer: add update-ref command\n + sequencer: define array with enum values\n + rebase-interactive: update 'merge' description\n + branch: consider refs under 'update-refs'\n + t2407: test branches currently using apply backend\n + t2407: test bisect and rebase as black-boxes\n + Merge branch 'ds/branch-checked-out' into ds/rebase-update-ref\n\n \"git rebase -i\" learns to update branches whose tip appear in the\n rebased range.\n\n Will merge to 'master'.\n source: \n\n\n* pw/xdiff-alloc (2022-07-08) 4 commits\n - xdiff: introduce XDL_ALLOC_GROW()\n - xdiff: introduce XDL_CALLOC_ARRAY()\n - xdiff: introduce xdl_calloc\n - xdiff: introduce XDL_ALLOC_ARRAY()\n\n Add a level of redirection to array allocation API in xdiff part,\n to make it easier to share with the libgit2 project.\n\n Will merge to 'next'?\n source: \n\n\n* ab/squelch-empty-fsync-traces (2022-07-18) 1 commit\n (merged to 'next' on 2022-07-19 at f77cd40c29)\n + trace2: only include \"fsync\" events if we git_fsync()\n\n Omit fsync-related trace2 entries when their values are all zero.\n\n Will merge to 'master'.\n source: \n\n\n* en/merge-restore-to-pristine (2022-07-21) 7 commits\n - merge: do not exit restore_state() prematurely\n - merge: ensure we can actually restore pre-merge state\n - merge: make restore_state() restore staged state too\n - merge: fix save_state() to work when there are stat-dirty files\n - merge: do not abort early if one strategy fails to handle the merge\n - merge-resolve: abort if index does not match HEAD\n - merge-ort-wrappers: make printed message match the one from recursive\n\n When \"git merge\" finds that it cannot perform a merge, it should\n restore the working tree to the state before the command was\n initiated, but in some corner cases it didn't.\n\n Will merge to 'next'?\n source: \n\n\n* zh/ls-files-format (2022-07-20) 1 commit\n - ls-files: introduce \"--format\" option\n\n \"git ls-files\" learns the \"--format\" option to tweak its output.\n\n Will merge to 'next'?\n source: \n\n\n* js/commit-graph-parsing-without-repo-settings (2022-07-14) 1 commit\n (merged to 'next' on 2022-07-19 at bcc29d823d)\n + commit-graph: pass repo_settings instead of repository\n\n API tweak to make it easier to run fuzz testing on commit-graph parser.\n\n Will merge to 'master'.\n source: \n\n\n* jt/connected-show-missing-from-which-side (2022-06-10) 1 commit\n - fetch,fetch-pack: clarify connectivity check error\n\n We may find an object missing after a \"git fetch\" stores the\n objects it obtained from the other side, but it is not necessarily\n because the remote failed to send necessary objects. Reword the\n messages in an attempt to help users explore other possibilities\n when they hit this error.\n\n Expecting a reroll.\n source: <20220610195247.1177549-1-jonathantanmy@google.com>\n\n\n* tb/show-ref-count (2022-06-06) 2 commits\n - builtin/show-ref.c: limit output with `--count`\n - builtin/show-ref.c: rename `found_match` to `matches_nr`\n\n \"git show-ref\" learned to stop after emitting N refs with the new\n \"--count=N\" option.\n\n Expecting a reroll.\n cf. \n source: \n\n\n* ds/bundle-uri-more (2022-06-06) 6 commits\n - fetch: add 'refs/bundle/' to log.excludeDecoration\n - bundle-uri: add support for http(s):// and file://\n - fetch: add --bundle-uri option\n - bundle-uri: create basic file-copy logic\n - remote-curl: add 'get' capability\n - docs: document bundle URI standard\n\n The \"bundle URI\" topic.\n\n Needs review.\n source: \n\n\n* js/bisect-in-c (2022-06-27) 16 commits\n - bisect: no longer try to clean up left-over `.git/head-name` files\n - bisect: remove Cogito-related code\n - Turn `git bisect` into a full built-in\n - bisect: move even the command-line parsing to `bisect--helper`\n - bisect: teach the `bisect--helper` command to show the correct usage strings\n - bisect--helper: return only correct exit codes in `cmd_*()`\n - bisect--helper: move the `BISECT_STATE` case to the end\n - bisect--helper: make `--bisect-state` optional\n - bisect--helper: align the sub-command order with git-bisect.sh\n - bisect--helper: using `--bisect-state` without an argument is a bug\n - bisect--helper: really retire `--bisect-autostart`\n - bisect--helper: really retire --bisect-next-check\n - bisect--helper: retire the --no-log option\n - bisect: avoid double-quoting when printing the failed command\n - bisect run: fix the error message\n - bisect: verify that a bogus option won't try to start a bisection\n\n Final bits of \"git bisect.sh\" have been rewritten in C.\n\n Expecting a (hopefully final) reroll.\n cf. <20627.86ilolhnnn.gmgdl@evledraar.gmail.com>\n source: \n\n--------------------------------------------------\n[Discarded]\n\n* ar/send-email-confirm-by-default (2022-04-22) 1 commit\n . send-email: always confirm by default\n\n \"git send-email\" is changed so that by default it asks for\n confirmation before sending each message out.\n\n Discarded.\n I wanted to like this, and had it in the version of Git I use\n myself for daily work, but the prompting turned out to be somewhat\n distracting.\n source: <20220422083629.1404989-1-hi@alyssa.is>\n"},{"id":"459820","messageId":"CABPp-BEpnEUKvBOy2e0=EnF8Qj14myNx2OOsLS=5gtC6xYKLtw@mail.gmail.com","threadId":"58214","inReplyTo":"xmqqh738bq21.fsf@gitster.g","subject":"en/merge-restore-to-pristine (Was: Re: What's cooking in git.git (Jul 2022, #07; Fri, 22))","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2022-07-23T02:28:38Z","receivedAt":"2022-07-23T02:29:19Z","isPatch":false,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"On Fri, Jul 22, 2022 at 6:55 PM Junio C Hamano wrote:\n>\n> * en/merge-restore-to-pristine (2022-07-21) 7 commits\n> - merge: do not exit restore_state() prematurely\n> - merge: ensure we can actually restore pre-merge state\n> - merge: make restore_state() restore staged state too\n> - merge: fix save_state() to work when there are stat-dirty files\n> - merge: do not abort early if one strategy fails to handle the merge\n> - merge-resolve: abort if index does not match HEAD\n> - merge-ort-wrappers: make printed message match the one from recursive\n>\n> When \"git merge\" finds that it cannot perform a merge, it should\n> restore the working tree to the state before the command was\n> initiated, but in some corner cases it didn't.\n>\n> Will merge to 'next'?\n> source: \n\nI just submitted a v5 based on some feedback from Ævar.\n\n(Also, did you forget to update the source link by chance? Your\nreferenced source link is v3, but the version in your tree is v4.)\n"},{"id":"459835","messageId":"20220723134834.9693-1-matheus.bernardino@usp.br","threadId":"58214","inReplyTo":"xmqqh738bq21.fsf@gitster.g","subject":"mt/doc-config (Was: Re: What's cooking in git.git (Jul 2022, #07; Fri, 22))","fromName":"Matheus Tavares","fromEmail":"matheus.bernardino@usp.br","sentAt":"2022-07-23T13:48:34Z","receivedAt":"2022-07-23T13:48:48Z","isPatch":false,"sender":{"key":"matheus.tavb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12701583?v=4"},"body":"On Fri, Jul 22, 2022 at 10:01 PM Junio C Hamano wrote:\n>\n> * mt/doc-config (2022-07-14) 3 commits\n> - doc: notes: unify configuration variables definitions\n> - doc: apply: unify configuration variables definitions\n> - doc: grep: unify configuration variables definitions\n> \n> Unify description of configuration variables used by individual\n> commands in the documentation of the commands and the documentation\n> of the \"git config\".\n> \n> Will discard (Retracted?).\n\nYes, feel free to discard this one. Thanks.\n"},{"id":"459931","messageId":"Yt8RcDeSht56gU5v@nand.local","threadId":"58214","inReplyTo":"xmqqh738bq21.fsf@gitster.g","subject":"tb/commit-graph-genv2-upgrade-fix","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2022-07-25T21:56:00Z","receivedAt":"2022-07-25T21:56:05Z","isPatch":false,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"On Fri, Jul 22, 2022 at 06:01:10PM -0700, Junio C Hamano wrote:\n> * tb/commit-graph-genv2-upgrade-fix (2022-07-15) 3 commits\n> - commit-graph: fix corrupt upgrade from generation v1 to v2\n> - commit-graph: introduce `repo_find_commit_pos_in_graph()`\n> - t5318: demonstrate commit-graph generation v2 corruption\n>\n> There was a bug in the codepath to upgrade generation information\n> in commit-graph from v1 to v2 format, which has been corrected.\n>\n> Will merge to 'next'?\n> source: \n\nYeah, I think that this one is ready to go. It's the minimal fix I would\nconsider acceptable for squashing this bug, but it should do what we\nneed.\n\nStolee gave it a positive review, and I doubt he has any objections.\n\nThanks,\nTaylor\n"},{"id":"459966","messageId":"d1d460f6-e70f-b17f-73a5-e56d604dd9d5@github.com","threadId":"58214","inReplyTo":"Yt8RcDeSht56gU5v@nand.local","subject":"Re: tb/commit-graph-genv2-upgrade-fix","fromName":"Derrick Stolee","fromEmail":"derrickstolee@github.com","sentAt":"2022-07-26T11:29:22Z","receivedAt":"2022-07-26T11:29:28Z","isPatch":false,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"On 7/25/22 5:56 PM, Taylor Blau wrote:\n> On Fri, Jul 22, 2022 at 06:01:10PM -0700, Junio C Hamano wrote:\n>> * tb/commit-graph-genv2-upgrade-fix (2022-07-15) 3 commits\n>> - commit-graph: fix corrupt upgrade from generation v1 to v2\n>> - commit-graph: introduce `repo_find_commit_pos_in_graph()`\n>> - t5318: demonstrate commit-graph generation v2 corruption\n>>\n>> There was a bug in the codepath to upgrade generation information\n>> in commit-graph from v1 to v2 format, which has been corrected.\n>>\n>> Will merge to 'next'?\n>> source: \n> \n> Yeah, I think that this one is ready to go. It's the minimal fix I would\n> consider acceptable for squashing this bug, but it should do what we\n> need.\n> \n> Stolee gave it a positive review, and I doubt he has any objections.\n\nI agree that this is ready for 'next'.\n\nThanks,\n-Stolee\n"},{"id":"460004","messageId":"YuBlD3o5bYMg8f6i@coredump.intra.peff.net","threadId":"58214","inReplyTo":"xmqqh738bq21.fsf@gitster.g","subject":"Re: ds/midx-with-less-memory","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2022-07-26T22:05:03Z","receivedAt":"2022-07-26T22:05:12Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Jul 22, 2022 at 06:01:10PM -0700, Junio C Hamano wrote:\n\n> * ds/midx-with-less-memory (2022-07-19) 3 commits\n> (merged to 'next' on 2022-07-20 at 250d257c3e)\n> + midx: reduce memory pressure while writing bitmaps\n> + midx: extract bitmap write setup\n> + pack-bitmap-write: use const for hashes\n> \n> The codepath to write multi-pack index has been taught to release a\n> large chunk of memory that holds an array of objects in the packs,\n> as soon as it is done with the array, to reduce memory consumption.\n> \n> Will merge to 'master'.\n> source: \n\nThis topic looks very nice, but I think we might want this additional\ncleanup on top:\n\n-- >8 --\nSubject: [PATCH] write_midx_bitmap(): drop unused refs_snapshot parameter\n\nThe refactoring in 90b2bb710d (midx: extract bitmap write setup,\n2022-07-19) hoisted our call to find_commits_for_midx_bitmap() into the\ncaller, which means we no longer need to see the refs_snapshot at all.\n\nSigned-off-by: Jeff King \n---\n midx.c | 3 +--\n 1 file changed, 1 insertion(+), 2 deletions(-)\n\ndiff --git a/midx.c b/midx.c\nindex 772ab7d294..4e956cacb7 100644\n--- a/midx.c\n+++ b/midx.c\n@@ -1059,7 +1059,6 @@ static int write_midx_bitmap(const char *midx_name,\n \t\t\t struct commit **commits,\n \t\t\t uint32_t commits_nr,\n \t\t\t uint32_t *pack_order,\n-\t\t\t const char *refs_snapshot,\n \t\t\t unsigned flags)\n {\n \tint ret, i;\n@@ -1462,7 +1461,7 @@ static int write_midx_internal(const char *object_dir,\n \n \t\tif (write_midx_bitmap(midx_name.buf, midx_hash, &pdata,\n \t\t\t\t commits, commits_nr, ctx.pack_order,\n-\t\t\t\t refs_snapshot, flags) < 0) {\n+\t\t\t\t flags) < 0) {\n \t\t\terror(_(\"could not write multi-pack bitmap\"));\n \t\t\tresult = 1;\n \t\t\tgoto cleanup;\n-- \n2.37.1.641.g73229dff8a\n\n"},{"id":"460018","messageId":"1b2f7486-faeb-c71e-76c4-1afce2a1519d@github.com","threadId":"58214","inReplyTo":"YuBlD3o5bYMg8f6i@coredump.intra.peff.net","subject":"Re: ds/midx-with-less-memory","fromName":"Derrick Stolee","fromEmail":"derrickstolee@github.com","sentAt":"2022-07-27T11:29:22Z","receivedAt":"2022-07-27T11:29:29Z","isPatch":false,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"On 7/26/22 6:05 PM, Jeff King wrote:\n> On Fri, Jul 22, 2022 at 06:01:10PM -0700, Junio C Hamano wrote:\n> \n>> * ds/midx-with-less-memory (2022-07-19) 3 commits\n>> (merged to 'next' on 2022-07-20 at 250d257c3e)\n>> + midx: reduce memory pressure while writing bitmaps\n>> + midx: extract bitmap write setup\n>> + pack-bitmap-write: use const for hashes\n>>\n>> The codepath to write multi-pack index has been taught to release a\n>> large chunk of memory that holds an array of objects in the packs,\n>> as soon as it is done with the array, to reduce memory consumption.\n>>\n>> Will merge to 'master'.\n>> source: \n> \n> This topic looks very nice, but I think we might want this additional\n> cleanup on top:\n> \n> -- >8 --\n> Subject: [PATCH] write_midx_bitmap(): drop unused refs_snapshot parameter\n> \n> The refactoring in 90b2bb710d (midx: extract bitmap write setup,\n> 2022-07-19) hoisted our call to find_commits_for_midx_bitmap() into the\n> caller, which means we no longer need to see the refs_snapshot at all.\n\nGood find! I'm happy to see the unused parameter work is coming\nalong ;)\n\n> @@ -1059,7 +1059,6 @@ static int write_midx_bitmap(const char *midx_name,\n> \t\t\t struct commit **commits,\n> \t\t\t uint32_t commits_nr,\n> \t\t\t uint32_t *pack_order,\n> -\t\t\t const char *refs_snapshot,\n> \t\t\t unsigned flags)\n> {\n> \tint ret, i;\n> @@ -1462,7 +1461,7 @@ static int write_midx_internal(const char *object_dir,\n> \n> \t\tif (write_midx_bitmap(midx_name.buf, midx_hash, &pdata,\n> \t\t\t\t commits, commits_nr, ctx.pack_order,\n> -\t\t\t\t refs_snapshot, flags) < 0) {\n> +\t\t\t\t flags) < 0) {\n> \t\t\terror(_(\"could not write multi-pack bitmap\"));\n> \t\t\tresult = 1;\n> \t\t\tgoto cleanup;\n\nThanks for the patch!\n\n-Stolee\n"},{"id":"460028","messageId":"xmqqv8risi9w.fsf@gitster.g","threadId":"58214","inReplyTo":"YuBlD3o5bYMg8f6i@coredump.intra.peff.net","subject":"Re: ds/midx-with-less-memory","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-07-27T15:10:51Z","receivedAt":"2022-07-27T15:11:01Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> On Fri, Jul 22, 2022 at 06:01:10PM -0700, Junio C Hamano wrote:\n>\n>> * ds/midx-with-less-memory (2022-07-19) 3 commits\n>> (merged to 'next' on 2022-07-20 at 250d257c3e)\n>> + midx: reduce memory pressure while writing bitmaps\n>> + midx: extract bitmap write setup\n>> + pack-bitmap-write: use const for hashes\n>> \n>> The codepath to write multi-pack index has been taught to release a\n>> large chunk of memory that holds an array of objects in the packs,\n>> as soon as it is done with the array, to reduce memory consumption.\n>> \n>> Will merge to 'master'.\n>> source: \n>\n> This topic looks very nice, but I think we might want this additional\n> cleanup on top:\n>\n> -- >8 --\n> Subject: [PATCH] write_midx_bitmap(): drop unused refs_snapshot parameter\n>\n> The refactoring in 90b2bb710d (midx: extract bitmap write setup,\n> 2022-07-19) hoisted our call to find_commits_for_midx_bitmap() into the\n> caller, which means we no longer need to see the refs_snapshot at all.\n>\n> Signed-off-by: Jeff King \n> ---\n> midx.c | 3 +--\n> 1 file changed, 1 insertion(+), 2 deletions(-)\n\nNice. Is this -Wunused-parameter at work?\n\nThanks, will queue.\n\n> diff --git a/midx.c b/midx.c\n> index 772ab7d294..4e956cacb7 100644\n> --- a/midx.c\n> +++ b/midx.c\n> @@ -1059,7 +1059,6 @@ static int write_midx_bitmap(const char *midx_name,\n> \t\t\t struct commit **commits,\n> \t\t\t uint32_t commits_nr,\n> \t\t\t uint32_t *pack_order,\n> -\t\t\t const char *refs_snapshot,\n> \t\t\t unsigned flags)\n> {\n> \tint ret, i;\n> @@ -1462,7 +1461,7 @@ static int write_midx_internal(const char *object_dir,\n> \n> \t\tif (write_midx_bitmap(midx_name.buf, midx_hash, &pdata,\n> \t\t\t\t commits, commits_nr, ctx.pack_order,\n> -\t\t\t\t refs_snapshot, flags) < 0) {\n> +\t\t\t\t flags) < 0) {\n> \t\t\terror(_(\"could not write multi-pack bitmap\"));\n> \t\t\tresult = 1;\n> \t\t\tgoto cleanup;\n"},{"id":"460032","messageId":"YuGOLXc3QWqPc8wC@coredump.intra.peff.net","threadId":"58214","inReplyTo":"xmqqv8risi9w.fsf@gitster.g","subject":"Re: ds/midx-with-less-memory","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2022-07-27T19:12:45Z","receivedAt":"2022-07-27T19:20:06Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Jul 27, 2022 at 08:10:51AM -0700, Junio C Hamano wrote:\n\n> Nice. Is this -Wunused-parameter at work?\n\nYep. I've been offline a bit recently, but I'm hoping to start sending\npatches to get that work upstreamed (it's not complicated, it's just a\nton of patches to annotate all of the callbacks, etc, that need to have\nunused parameters in them).\n\n-Peff\n"}]}