Here are the topics that have been cooking in my tree. Commits prefixed with '+' are in 'next' (being in 'next' is a sign that a topic is stable enough to be used and are candidate to be in a future release). Commits prefixed with '-' are only in 'seen', and aren't considered "accepted" at all. A topic without enough support may be discarded after a long period of no activity. The -rc1 has been tagged for this cycle. People are free to discuss topics that has no relevance to the upcoming release, but we would appreciate if they instead concentrated on finding and fixing recent regressions in the upcoming release. Even though I may be replacing topics in 'seen' with their new iterations, I may not be picking up patches on new topics to 'seen', until the final around the beginning of the next month (cf. https://tinyurl.com/gitCal). These patches are welcome to come back in a more polished form after that happens (read: discussions on them are not forbidden. just allow me to leave my tree less distracted by new topics). Copies of the source code to Git live in many repositories, and the following is a list of the ones I push into or their mirrors. Some repositories have only a subset of branches. With maint, master, next, seen, todo: git://git.kernel.org/pub/scm/git/git.git/ git://repo.or.cz/alt-git.git/ https://kernel.googlesource.com/pub/scm/git/git/ https://github.com/git/git/ https://gitlab.com/git-vcs/git/ With all the integration branches and topics broken out: https://github.com/gitster/git/ Even though the preformatted documentation in HTML and man format are not sources, they are published in these repositories for convenience (replace "htmldocs" with "manpages" for the manual pages): git://git.kernel.org/pub/scm/git/git-htmldocs.git/ https://github.com/gitster/git-htmldocs.git/ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- [Graduated to 'master'] * ac/bitmap-lookup-table (2022-09-23) 1 commit (merged to 'next' on 2022-09-23 at 8374b2bb46) + pack-bitmap: improve grammar of "xor chain" error message Grammofix. source: <20220922025158.415969-1-alexhenrie24@xxxxxxxxx> * jk/list-objects-filter-cleanup (2022-09-22) 1 commit (merged to 'next' on 2022-09-22 at 60e9c427db) + list-objects-filter: initialize sub-filter structs Fix uninitialized memory access in a recent fix-up that is already in -rc1. source: <YywsZU9UUoC08UcN@xxxxxxxxxxxxxxxxxxxxxxx> * ma/scalar-to-main-fix (2022-09-23) 1 commit (merged to 'next' on 2022-09-23 at 5229e60838) + cmd-list.perl: fix identifying man sections Fix manpage generation. source: <20220923080733.1995862-1-martin.agren@xxxxxxxxx> -------------------------------------------------- [New Topics] * ds/scalar-unregister-idempotent (2022-09-22) 2 commits - scalar: make 'unregister' idempotent - maintenance: add 'unregister --force' "git maintenance unregister" in a repository that is already been unregistered reported an error. Will merge to 'next'? source: <pull.1358.v2.git.1663853837.gitgitgadget@xxxxxxxxx> * jk/clone-allow-bare-and-o-together (2022-09-22) 1 commit - clone: allow "--bare" with "-o" "git clone" did not like to see the "--bare" and the "--origin" options used together without a good reason. Will merge to 'next'. source: <YyvzVdfQVdysvMp2@xxxxxxxxxxxxxxxxxxxxxxx> * jk/fsck-on-diet (2022-09-22) 3 commits - parse_object_buffer(): respect save_commit_buffer - fsck: turn off save_commit_buffer - fsck: free tree buffers after walking unreachable objects "git fsck" failed to release contents of tree objects already used from the memory, which has been fixed. Will merge to 'next'. source: <Yyw0PSVe3YTQGgRS@xxxxxxxxxxxxxxxxxxxxxxx> * jk/remote-rename-without-fetch-refspec (2022-09-22) 1 commit - remote: handle rename of remote without fetch refspec "git remote rename" failed to rename a remote without fetch refspec, which has been corrected. Will merge to 'next'. source: <YyvzqZ5tmI0UdRAW@xxxxxxxxxxxxxxxxxxxxxxx> * js/merge-ort-in-read-only-repo (2022-09-22) 1 commit - merge-ort: fix segmentation fault in read-only repositories In read-only repositories, "git merge-tree" tried to come up with a merge result tree object, which it failed (which is not wrong) and led to a segfault (which is bad), which has been corrected. Expecting a reroll. cf. <916o55op-qpqo-5o41-931s-8q54p7301sr2@xxxxxx> source: <pull.1362.v3.git.1663875999939.gitgitgadget@xxxxxxxxx> * mc/cred-helper-ignore-unknown (2022-09-22) 3 commits - osxkeychain: clarify that we ignore unknown lines - netrc: ignore unknown lines (do not die) - wincred: ignore unknown lines (do not die) Most credential helpers ignored unknown entries in a credential description, but a few died upon seeing them. The latter were taught to ignore them, too Will merge to 'next'? source: <pull.1363.git.1663865974.gitgitgadget@xxxxxxxxx> * ds/bitmap-lookup-remove-tracing (2022-09-23) 2 commits - SQUASH??? - pack-bitmap: remove trace2 region from hot path Perf-fix? Expecting a reroll. cf. <edf25c5d-06f4-0b91-6773-f4fe7705c2f8@xxxxxxxxxx> source: <pull.1365.git.1663938034607.gitgitgadget@xxxxxxxxx> * es/retire-efgrep (2022-09-23) 2 commits - check-non-portable-shell: detect obsolescent egrep/fgrep - Merge branch 'dd/retire-efgrep' into es/retire-efgrep (this branch uses dd/retire-efgrep.) Prepare for GNU [ef]grep that throw warning of their uses. Will merge to 'next'. source: <pull.1338.git.git.1663805905554.gitgitgadget@xxxxxxxxx> * cw/submodule-status-in-parallel (2022-09-23) 4 commits . diff-lib: parallelize run_diff_files for submodules . diff-lib: refactor functions . submodule: move status parsing into function . run-command: add pipe_output to run_processes_parallel Allow the internal "diff-files" engine to run "how has this submodule changed?" in parallel to speed up "git status". Needs review. cf. https://github.com/git/git/actions/runs/3115673002/jobs/5052804463 source: <20220922232947.631309-1-calvinwan@xxxxxxxxxx> * vd/fix-unaligned-read-index-v4 (2022-09-23) 1 commit - read-cache: avoid misaligned reads in index v4 The codepath that reads from the index v4 had unaligned memory accesses, which has been corrected. Expecting a reroll? cf. <Yy4nkEnhuzt2iH+R@xxxxxxxxxxxxxxxxxxxxxxx> source: <pull.1366.git.1663962236069.gitgitgadget@xxxxxxxxx> -------------------------------------------------- [Stalled] * es/mark-gc-cruft-as-experimental (2022-08-03) 2 commits - config: let feature.experimental imply gc.cruftPacks=true - gc: add tests for --cruft and friends Enable gc.cruftpacks by default for those who opt into feature.experimental setting. Expecting a reroll. cf. <220804.86a68ke9d5.gmgdl@xxxxxxxxxxxxxxxxxxx> cf. <6803b725-526e-a1c8-f15c-a9ed4a144d4c@xxxxxxxxxx> source: <20220803205721.3686361-1-emilyshaffer@xxxxxxxxxx> * es/doc-creation-factor-fix (2022-07-28) 2 commits - range-diff: clarify --creation-factor=<factor> - format-patch: clarify --creation-factor=<factor> Expecting a reroll by somebody more familiar with the logic cf. <xmqqo7wfix7p.fsf@gitster.g> source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@xxxxxx> * cw/remote-object-info (2022-08-13) 7 commits - SQUASH??? - cat-file: add remote-object-info to batch-command - transport: add client support for object-info - serve: advertise object-info feature - protocol-caps: initialization bug fix - fetch-pack: move fetch initialization - fetch-pack: refactor packet writing A client component to talk with the object-info endpoint. Expecting a reroll. cf. <20220728230210.2952731-1-calvinwan@xxxxxxxxxx> cf. <CAFySSZDvgwbbHCHfyuaqX3tKsr-GjJ9iihygg6rNNe46Ys7_EA@xxxxxxxxxxxxxx> source: <20220728230210.2952731-1-calvinwan@xxxxxxxxxx> -------------------------------------------------- [Cooking] * dd/retire-efgrep (2022-09-21) 4 commits (merged to 'next' on 2022-09-21 at 22bc339be1) + t: convert fgrep usage to "grep -F" + t: convert egrep usage to "grep -E" + t: remove \{m,n\} from BRE grep usage + CodingGuidelines: allow grep -E (this branch is used by es/retire-efgrep.) Prepare for GNU [ef]grep that throw warning of their uses. Will cook in 'next'. source: <cover.1663765176.git.congdanhqx@xxxxxxxxx> * tb/midx-repack-ignore-cruft-packs (2022-09-21) 7 commits - midx.c: avoid cruft packs with non-zero `repack --batch-size` - midx.c: remove unnecessary loop condition - midx.c: replace `xcalloc()` with `CALLOC_ARRAY()` - midx.c: avoid cruft packs with `repack --batch-size=0` - midx.c: prevent `expire` from removing the cruft pack - Documentation/git-multi-pack-index.txt: clarify expire behavior - Documentation/git-multi-pack-index.txt: fix typo "git multi-pack-index repack/expire" used to repack unreachable cruft into a new pack, which have been corrected. Will merge to 'next'? cf. <63a1c3d4-eff3-af10-4263-058c88e74594@xxxxxxxxxx> source: <cover.1663638929.git.me@xxxxxxxxxxxx> * ah/fsmonitor-daemon-usage-non-l10n (2022-09-21) 1 commit (merged to 'next' on 2022-09-21 at bc69a73c6c) + fsmonitor--daemon: don't translate literal commands Fix messages incorrectly marked for translation. Will cook in 'next'. source: <20220920050709.326359-1-alexhenrie24@xxxxxxxxx> * so/diff-merges-cleanup (2022-09-16) 3 commits (merged to 'next' on 2022-09-22 at 57694bbed7) + diff-merges: clarify log.diffMerges documentation + diff-merges: cleanup set_diff_merges() + diff-merges: cleanup func_by_opt() Code clean-up. Will cook in 'next'. source: <20220914193102.5275-1-sorganov@xxxxxxxxx> * ja/rebase-i-avoid-amending-self (2022-09-21) 2 commits - SQUASH??? resurrect previous version of the tests - sequencer: avoid dropping fixup commit that targets self via commit-ish "git rebase -i" can mistakenly attempt to apply a fixup to a commit itself, which has been corrected. Does not seem to pass its own test. source: <20220920031140.1220220-1-aclopte@xxxxxxxxx> * ac/fuzzers (2022-09-19) 1 commit - fuzz: reorganise the path for existing oss-fuzz fuzzers source: <pull.1353.v4.git.1663598215154.gitgitgadget@xxxxxxxxx> * hn/parse-worktree-ref (2022-09-19) 1 commit - refs: unify parse_worktree_ref() and ref_type() source: <pull.1325.v2.git.git.1663605291172.gitgitgadget@xxxxxxxxx> * ed/fsmonitor-on-networked-macos (2022-09-21) 6 commits - fsmonitor: add documentation for allowRemote and socketDir options - fsmonitor: check for compatability before communicating with fsmonitor - fsmonitor: deal with synthetic firmlinks on macOS - fsmonitor: avoid socket location check if using hook - fsmonitor: relocate socket file if .git directory is remote - fsmonitor: refactor filesystem checks to common interface By default, use of fsmonitor on a repository on networked filesystem is disabled. Add knobs to make it workable on macOS. Will merge to 'next'? source: <pull.1326.v10.git.1663705986.gitgitgadget@xxxxxxxxx> * rj/branch-edit-description-with-nth-checkout (2022-09-12) 2 commits - branch: support for shortcuts like @{-1} completed - branch: refactor "edit_description" code path "git branch --edit-description @{-1}" is now a way to edit branch description of the branch you were on before switching to the current branch. Needs review. source: <7abdb5a9-5707-7897-4196-8d2892beeb81@xxxxxxxxx> * mj/credential-helper-auth-headers (2022-09-13) 8 commits - http: set specific auth scheme depending on credential - http: move proactive auth to first slot creation - http: store all request headers on active_request_slot - credential: add WWW-Authenticate header to cred requests - http: read HTTP WWW-Authenticate response headers - osxkeychain: clarify that we ignore unknown lines - netrc: ignore unknown lines (do not die) - wincred: ignore unknown lines (do not die) RFC source: <pull.1352.git.1663097156.gitgitgadget@xxxxxxxxx> * jc/environ-docs (2022-09-16) 5 commits - environ: GIT_INDEX_VERSION affects not just a new repository - environ: simplify description of GIT_INDEX_FILE - environ: GIT_FLUSH should be made a usual Boolean - environ: explain Boolean environment variables - environ: document GIT_SSL_NO_VERIFY Documentation on various Boolean GIT_* environment variables have been clarified. Will merge to 'next'? source: <20220915160659.126441-1-gitster@xxxxxxxxx> * rs/diff-caret-bang-with-parents (2022-09-15) 6 commits - revision: add parents after child for ^! - revision: rename add_parents_only() to add_nth_parent() - revision: factor out add_parents() - revision: factor out add_parent() - revision: factor out get_commit() - revision: use strtol_i() for exclude_parent "git diff rev^!" did not show combined diff to go to the rev from its parents. Needs review. source: <ba6eea28-fb3a-b376-2529-351727c02f1a@xxxxxx> * ab/doc-synopsis-and-cmd-usage (2022-09-07) 34 commits - tests: start asserting that *.txt SYNOPSIS matches -h output - doc txt & -h consistency: make "worktree" consistent - worktree: define subcommand -h in terms of command -h - reflog doc: list real subcommands up-front - doc txt & -h consistency: make "commit" consistent - doc txt & -h consistency: make "diff-tree" consistent - doc txt & -h consistency: use "[<label>...]" for "zero or more" - doc txt & -h consistency: make "annotate" consistent - doc txt & -h consistency: make "stash" consistent - doc txt & -h consistency: add missing options - doc txt & -h consistency: use "git foo" form, not "git-foo" - doc txt & -h consistency: make "bundle" consistent - doc txt & -h consistency: make "read-tree" consistent - doc txt & -h consistency: make "rerere" consistent - doc txt & -h consistency: add missing options and labels - doc txt & -h consistency: make output order consistent - doc txt & -h consistency: add or fix optional "--" syntax - doc txt & -h consistency: fix mismatching labels - t/helper/test-proc-receive.c: use "<options>", not "<options>..." - doc txt & -h consistency: use "<options>", not "<options>..." - stash doc SYNOPSIS & -h: correct padding around "[]()" - doc txt & -h consistency: correct padding around "[]()" - doc txt & -h consistency: add missing "]" to bugreport "-h" - doc txt & -h consistency: add "-z" to cat-file "-h" - doc txt & -h consistency: fix incorrect alternates syntax - doc txt & -h consistency: word-wrap - built-ins: consistently add "\n" between "usage" and options - doc SYNOPSIS & -h: fix incorrect alternates syntax - doc SYNOPSIS: consistently use ' for commands - doc SYNOPSIS: don't use ' for subcommands - blame: use a more detailed usage_msg_optf() error on bad -L - bundle: define subcommand -h in terms of command -h - builtin/bundle.c: use \t, not fix indentation 2-SP indentation - CodingGuidelines: update and clarify command-line conventions The short-help text shown by "git cmd -h" and the synopsis text shown at the beginning of "git help cmd" have been made more consistent. Needs review. source: <cover-00.34-00000000000-20220902T092734Z-avarab@xxxxxxxxx> * ab/coccicheck-incremental (2022-08-31) 9 commits - spatchcache: add a ccache-alike for "spatch" - cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES - cocci: make "coccicheck" rule incremental - cocci: split off "--all-includes" from SPATCH_FLAGS - cocci: split off include-less "tests" from SPATCH_FLAGS - Makefile: split off SPATCH_BATCH_SIZE comment from "cocci" heading - Makefile: have "coccicheck" re-run if flags change - Makefile: add ability to TAB-complete cocci *.patch rules - cocci rules: remove unused "F" metavariable from pending rule "make coccicheck" is time consuming. It has been made to run more incrementally. Needs review. source: <cover-v2-0.9-00000000000-20220831T205130Z-avarab@xxxxxxxxx> * tb/diffstat-with-utf8-strwidth (2022-09-14) 1 commit - diff.c: use utf8_strwidth() to count display width "git diff --stat" etc. were invented back when everything was ASCII and strlen() was a way to measure the display width of a string; adjust them to compute the display width assuming UTF-8 pathnames. Expecting a reroll. source: <20220914151333.3309-1-tboegi@xxxxxx> * gc/submodule-clone-update-with-branches (2022-08-29) 6 commits - clone, submodule update: check out branches - submodule--helper: refactor up-to-date criterion - submodule: return target of submodule symref - t5617: drop references to remote-tracking branches - repo-settings: add submodule_propagate_branches - clone: teach --detach option "git clone --recurse-submodules" and "git submodule update" learns to honor the "propagete branches" option. Expecting a reroll. cf. <20220901200047.515294-1-jonathantanmy@xxxxxxxxxx> and others source: <pull.1321.git.git.1661806456.gitgitgadget@xxxxxxxxx> * sy/sparse-grep (2022-09-23) 1 commit - builtin/grep.c: integrate with sparse index "git grep" learned to expand the sparse-index more lazily and on demand in a sparse checkout. source: <20220923041842.27817-2-shaoxuan.yuan02@xxxxxxxxx> * ds/use-platform-regex-on-macos (2022-08-26) 1 commit (merged to 'next' on 2022-09-14 at 80905596d8) + grep: fix multibyte regex handling under macOS With a bit of header twiddling, use the native regexp library on macOS instead of the compat/ one. Will cook in 'next'. cf. <xmqqzgf389k9.fsf@gitster.g> source: <20220826085815.2771102-1-dds@xxxxxxx> * ds/bundle-uri-3 (2022-09-09) 10 commits - bundle-uri: fetch a list of bundles - bundle-uri: limit recursion depth for bundle lists - bundle-uri: parse bundle list in config format - bundle-uri: unit test "key=value" parsing - bundle-uri: create "key=value" line parsing - bundle-uri: create base key-value pair parsing - bundle-uri: create bundle_list struct and helpers - bundle-uri: use plain string in find_temp_filename() - bundle-uri: short-circuit capability parsing - Merge branch 'ds/bundle-uri-clone' into ds/bundle-uri-3 Define the logical elements of a "bundle list", data structure to store them in-core, format to transfer them, and code to parse them. Needs review. source: <pull.1333.v2.git.1662734015.gitgitgadget@xxxxxxxxx> * js/cmake-updates (2022-08-24) 5 commits - cmake: increase time-out for a long-running test - cmake: avoid editing t/test-lib.sh - add -p: avoid ambiguous signed/unsigned comparison - cmake: copy the merge tools for testing - cmake: make it easier to diagnose regressions in CTest runs Update to build procedure with VS using CMake/CTest. Expecting a reroll. cf. <3df77ffd-85a2-3a54-9005-34a24ec6e82d@xxxxxxxxxx> cf. <531620e1-de4c-74aa-c840-c12ce81f8740@xxxxxxxxxx> and others source: <pull.1320.v2.git.1661243463.gitgitgadget@xxxxxxxxx> * pw/rebase-keep-base-fixes (2022-09-07) 7 commits - rebase --keep-base: imply --no-fork-point - rebase --keep-base: imply --reapply-cherry-picks - rebase: factor out branch_base calculation - rebase: rename merge_base to branch_base - rebase: store orig_head as a commit - t3416: set $EDITOR in subshell - t3416: tighten two tests "git rebase --keep-base" used to discard the commits that are already cherry-picked to the upstream, even when "keep-base" meant that the base, on top of which the history is being rebuilt, does not yet include these cherry-picked commits. The --keep-base option now implies --reapply-cherry-picks and --no-fork-point options. Expecting a reroll. cf. <e25127f3-6135-b716-a12f-5dbe4f40dc42@xxxxxxxxx> source: <pull.1323.v2.git.1662561470.gitgitgadget@xxxxxxxxx> * ag/merge-strategies-in-c (2022-08-10) 14 commits - sequencer: use the "octopus" strategy without forking - sequencer: use the "resolve" strategy without forking - merge: use the "octopus" strategy without forking - merge: use the "resolve" strategy without forking - merge-octopus: rewrite in C - merge-recursive: move better_branch_name() to merge.c - merge-resolve: rewrite in C - merge-one-file: rewrite in C - update-index: move add_cacheinfo() to read-cache.c - merge-index: add a new way to invoke `git-merge-one-file' - merge-index: drop the index - merge-index: libify merge_one_path() and merge_all() - t6060: add tests for removed files - t6060: modify multiple files to expose a possible issue with merge-index An attempt to rewrite remaining merge strategies from shell to C. Needs more work. At the minimum, we should lose 11/14 and possibly 08/14. cf. <xmqq7d36vfur.fsf@gitster.g> source: <20220809185429.20098-1-alban.gruin@xxxxxxxxx> * po/glossary-around-traversal (2022-07-09) 3 commits - glossary: add reachability bitmap description - glossary: add commit graph description - glossary: add Object DataBase (ODB) abbreviation The glossary entries for "commit-graph file" and "reachability bitmap" have been added. Expecting a reroll. cf. <dfe0c1ab-33f8-f13e-71ce-1829bb0d2d7f@iee.email> source: <pull.1282.git.1657385781.gitgitgadget@xxxxxxxxx> * js/bisect-in-c (2022-08-30) 17 commits - bisect: no longer try to clean up left-over `.git/head-name` files - bisect: remove Cogito-related code - Turn `git bisect` into a full built-in - bisect: move even the command-line parsing to `bisect--helper` - bisect--helper: make `state` optional - bisect--helper: calling `bisect_state()` without an argument is a bug - bisect: avoid double-quoting when printing the failed command - bisect run: fix the error message - bisect: verify that a bogus option won't try to start a bisection - bisect--helper: migrate to OPT_SUBCOMMAND() - bisect--helper: make the order consistently `argc, argv` - bisect--helper: make `terms` an explicit singleton - bisect--helper: simplify exit code computation - bisect--helper: really retire `--bisect-autostart` - bisect--helper: really retire --bisect-next-check - bisect--helper: retire the --no-log option - Merge branch 'sg/parse-options-subcommand' into js/bisect-in-c Final bits of "git bisect.sh" have been rewritten in C. Needs review. cf. <xmqqv8pr8903.fsf@gitster.g> source: <pull.1132.v6.git.1661885419.gitgitgadget@xxxxxxxxx>
