Hi Junio, On Wed, 21 Oct 2020, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" <gitgitgadget@xxxxxxxxx> > writes: > > > In preparation for changing the default of init.defaultBranch to main, here > > are a couple of manual adjustments that cannot be automated (i.e., these > > adjustments are not mere search-and-replaces). > > > > This patch series is based on js/default-branch-name-part-3, and is part of > > the larger effort tracked at https://github.com/gitgitgadget/git/pull/655. > > > > The next patch series will be largely automated search-and-replaces; > > Obviously, the search-and-replace was the easy part, the manual inspection > > whether the changes are actually correct was much more involved. > > Yes. That's always the pain-point of a tree-wide change like this. To help with such a huge change, I tried to minimize the manual patches, and wrote the exact shell commands into the non-manual patches. Hopefully this will help us with the transition. > > What to expect next, after this patch series? Essentially, there is the > > large patch series that adjusts the entire test suite, with two patch series > > extracted from that effort: t5411 and t5515 simply require too large > > patches, and will therefore be presented as the next patch series after this > > one. > > This one is already a bit too ambitious in that it collides with > stuff in flight, by the way. Okay, I will leave out the t4013 changes from this patch series, and re-submit once `mk/diff-ignore-regex` advances to `next`. Thank you for reviewing this patch series, Dscho