Hi Junio, On Thu, 4 Feb 2021, Junio C Hamano wrote: > Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > > > The idea being that we want to be able to merge this branch as-is into Git > > for Windows (and also into microsoft/git), and therefore do not want to > > base it on a later commit that is not reachable from git-for-windows/git's > > `main` branch. > > > > Maybe it is time to merge `jc/macos-install-dependencies-fix` down to > > `maint`? Then we could base Simple IPC/FSMonitor on `maint` instead, and > > would still have the benefit we want. > > Now you mention it, if we ever have an update to the current 'maint' > branch, we'd trigger this known failure in macOS build without a > good reason, even though we have a fix that has been in use on the > 'master' and above. > > I definitely qshould merge the jc/macos-install-dependencies-fix > topic down to 'maint' now. > > Are there other topics that deserve to be in 'maint' that are > "obviously correct" people can think of? I looked over the branches merged into `master` that are not in `maint`, and from a cursory look, these seem to be good candidates: - pk/subsub-fetch-fix-take-2 - rs/rebase-commit-validation - en/stash-apply-sparse-checkout - ds/for-each-repo-noopfix - pb/mergetool-tool-help-fix - jk/t5516-deflake - jc/macos-install-dependencies-fix - jk/forbid-lf-in-git-url - jk/log-cherry-pick-duplicate-patches - js/skip-dashed-built-ins-from-config-mak >From a cursory look, it might seem as if ds/maintenance-prefetch-cleanup would also be a good candidate, but it is not based on `maint`, although it _does_ appear to fix an issue introduced in v2.30.0-rc0~23^2~8. There is another candidate that I am not _quite_ sure about: dl/p4-encode-after-kw-expansion. It _seems_ as if it would be good to apply on the maintenance train, but I am uncertain how important a bug fix it is. There are also a couple test updates that might be nice to have in `maint`: - nk/perf-fsmonitor-cleanup - mt/t4129-with-setgid-dir - ad/t4129-setfacl-target-fix Finally, there are documentation updates that I would probably merge, if I was tasked with updating `maint`: - ta/doc-typofix - pb/doc-modules-git-work-tree-typofix - jc/sign-off - vv/send-email-with-less-secure-apps-access - ug/doc-lose-dircache - ab/gettext-charset-comment-fix - bc/doc-status-short - tb/local-clone-race-doc - ab/fsck-doc-fix - jt/packfile-as-uri-doc Ciao, Dscho
