A few comments on some topics from other folks... On Wed, Sep 8, 2021 at 8:40 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: > * pb/test-use-user-env (2021-09-07) 3 commits > - test-lib-functions: keep user's debugger config files and TERM in 'debug' > - test-lib-functions: optionally keep HOME, TERM and SHELL in 'test_pause' > - test-lib-functions: use 'TEST_SHELL_PATH' in 'test_pause' > > Teach test_pause and test_debug to allow using the HOME and TERM > environment variables the user usually uses. > > Will merge to 'next'? Sounds good to me; I'm happy with the latest series. > * js/retire-preserve-merges (2021-09-07) 11 commits > - sequencer: restrict scope of a formerly public function > - rebase: remove a no-longer-used function > - rebase: stop mentioning the -p option in comments > - rebase: remove obsolete code comment > - rebase: drop the internal `rebase--interactive` command > - git-svn: drop support for `--preserve-merges` > - rebase: drop support for `--preserve-merges` > - pull: remove support for `--rebase=preserve` > - tests: stop testing `git rebase --preserve-merges` > - remote: warn about unhandled branch.<name>.rebase values > - t5520: do not use `pull.rebase=preserve` > > The "--preserve-merges" option of "git rebase" has been removed. > > Will merge to 'next'? I came a bit late to the party, but skimmed over the series as well. I'm very happy with the cleanups. The direction of the patches looks good in general, and didn't spot any problems in my spot checking. Merging down sounds good to me. > * ds/sparse-index-ignored-files (2021-09-07) 10 commits > - sparse-checkout: clear tracked sparse dirs > - sparse-index: add SPARSE_INDEX_MEMORY_ONLY flag > - attr: be careful about sparse directories > - sparse-checkout: create helper methods > - sparse-index: use WRITE_TREE_MISSING_OK > - sparse-index: silently return when cache tree fails > - unpack-trees: fix nested sparse-dir search > - sparse-index: silently return when not using cone-mode patterns > - t7519: rewrite sparse index test > - Merge branch 'ds/add-with-sparse-index' into ds/sparse-index-ignored-files > (this branch is used by sg/test-split-index-fix.) > > In cone mode, the sparse-index codepath learned to remove ignored > files (like build artifacts) outside the sparse cone, allowing the > entire directory outside the sparse cone to be removed, which is > especially useful when the sparse patterns change. > > Will merge to 'next'? I've reviewed each of the rounds in detail and I'm happy with this one; I think it's ready.
