On Tue, Dec 28, 2021 at 3:27 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > * ds/sparse-checkout-malformed-pattern-fix (2021-12-25) 4 commits > (merged to 'next' on 2021-12-27 at c410caf527) > + fixup! sparse-checkout: fix OOM error with mixed patterns > + sparse-checkout: refuse to add to bad patterns > + sparse-checkout: fix OOM error with mixed patterns > + sparse-checkout: fix segfault on malformed patterns > > Certain sparse-checkout patterns that are valid in non-cone mode > led to segfault in cone mode, which has been corrected. > > Will merge to 'master'. > source: <pull.1069.v4.git.1639671222.gitgitgadget@xxxxxxxxx> Eek, this was merged with the "fixup!" commit to next. I think that was a mistake...but what's the plan now? Merge to master as-is...or revert from next, then squash, then re-merge? > * gc/branch-recurse-submodules (2021-12-25) 7 commits > - fixup! branch: add --recurse-submodules option for branch creation > - branch: add --recurse-submodules option for branch creation > - builtin/branch: clean up action-picking logic in cmd_branch() > - branch: add a dry_run parameter to create_branch() > - branch: make create_branch() always create a branch > - branch: move --set-upstream-to behavior to dwim_and_setup_tracking() > - Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodules > (this branch uses js/branch-track-inherit.) > > "git branch" learned the "--recurse-submodules" option. > > Will merge to 'next'? > source: <20211220233459.45739-1-chooglen@xxxxxxxxxx> Can we squash the "fixup!" commit before merging? > * ab/cat-file (2021-12-25) 11 commits > - fixup! cat-file: fix remaining usage bugs > - cat-file: use GET_OID_ONLY_TO_DIE in --(textconv|filters) > - object-name.c: don't have GET_OID_ONLY_TO_DIE imply *_QUIETLY > - cat-file: correct and improve usage information > - cat-file: fix remaining usage bugs > - cat-file: make --batch-all-objects a CMDMODE > - cat-file: move "usage" variable to cmd_cat_file() > - cat-file docs: fix SYNOPSIS and "-h" output > - parse-options API: add a usage_msg_optf() > - cat-file tests: test messaging on bad objects/paths > - cat-file tests: test bad usage > > Assorted updates to "git cat-file", especially "-h". > > Will merge to 'next'? > source: <cover-v5-00.10-00000000000-20211222T041050Z-avarab@xxxxxxxxx> Can we squash the "fixup!" commit before merging? > * jt/conditional-config-on-remote-url (2021-12-15) 2 commits > - config: include file if remote URL matches a glob > - config: make git_config_include() static > > The conditional inclusion mechanism of configuration files using > "[includeIf <condition>]" learns to base its decision on the > URL of the remote repository the repository interacts with. > > How does this one look these days? > source: <cover.1639509048.git.jonathantanmy@xxxxxxxxxx> I gave it my Ack, though it appears we are solving the make-it-easy-to-include-pre-vetted-configuration multiple different ways with various caveats. While each case makes sense to me, I'm wondering if there's some more general solution that we should work on at some point (see https://lore.kernel.org/git/CABPp-BFLNqLuJ8o_6YZDYgd=Ft+wc9EjBPX+RRzwAdASKSW2bw@xxxxxxxxxxxxxx/). But that need not hold up this series right now.
