On Tue, Dec 08, 2020 at 01:13:35PM -0800, Junio C Hamano wrote:
> Taylor Blau <me@xxxxxxxxxxxx> writes:
>
> > On Mon, Dec 07, 2020 at 10:35:48AM -0800, Junio C Hamano wrote:
> >> "Johannes Schindelin via GitGitGadget" <gitgitgadget@xxxxxxxxx>
> >> writes:
> >>
> >> > This one goes on top of tb/pack-bitmap, and requires an update of
> >> > js/default-branch-name-tests-final-stretch (it no longer needs to
> >> > hard-code GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME in t5310).
> >>
> >> As the targetted topic is not in 'next' and marked with "Needs a bit
> >> of reshuffling?", I'd appreciate this patch to be also forwarded so
> >> that I do not have to worry about it myself.
> >
> > Ah, sorry that I missed this before sending out v3. I was hoping that
> > the fixup would be limited to one patch, but this needs to be either
> > spread across multiple patches, or applied at the end.
> >
> > Since I already sent v3, how do you want to handle this?
>
> As I have many other topics on the table to attend to, I can skip v3
> and take v4 if it is not too much trouble to fix the issue at the
> source. Thanks.
No problem at all. Your instructions were spot on (4/24 and 15/24 needed
adjusting, as well as the later patches which could no longer be
applied after modifying those two).
Checking my work against upstream, I can see that the only diff lines
which mention "master" are removals:
$ git diff @{u}.. | grep master
- git checkout master &&
- bitmaptip=$(git rev-parse master) &&
- git rev-list --count other...master >expect &&
- git rev-list --use-bitmap-index --count other...master >actual &&
- git --git-dir=clone.git fetch origin master:master &&
- git --git-dir=clone.git fetch origin master:master &&
and spot checking the inter-diff between what I have and what Johannes
posted I can see that they are the same. I've added some Helped-by lines
in the relevant patches to indicate where the suggestions came from.
v4 coming shortly...
Thanks,
Taylor
