Re: [edk2-devel] Incorrect push to edk2-platforms

["Michael D Kinney" <michael.d.kinney@intel.com>]

Hi Ard,

I agree it will always be there.

I have added a branch protection rule to edk2-platforms/master
to require linear history.  I would expect any future attempt
to push a merge commit will fail with an error.

Mike

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Ard Biesheuvel
> Sent: Friday, July 29, 2022 1:27 PM
> To: Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>; Ard Biesheuvel <ardb+tianocore@kernel.org>; edk2-devel-groups-io
> <devel@edk2.groups.io>; nd@arm.com; Leif Lindholm <quic_llindhol@quicinc.com>
> Subject: Re: [edk2-devel] Incorrect push to edk2-platforms
> 
> Reverting and reapplying kind of defeats the purpose, to be honest.
> The merge commit is still part of the history, and so its effect
> during a bisect will be there regardless.
> 
> So I suggest we just leave this as is.
> 
> 
> 
> On Fri, 29 Jul 2022 at 13:20, Kinney, Michael D
> <michael.d.kinney@intel.com> wrote:
> >
> > Hi Sami,
> >
> > There is one other instance of this in edk2-platform history.
> >
> > It was immediately followed by a Revert.
> >
> > --------------
> > commit 3e31cfea3de2fe49b49a67a1d6c9f9ca09e7f332
> > Author: Siyuan Fu <siyuan.fu@intel.com>
> > Date:   Mon Feb 10 12:29:48 2020 +0800
> >
> >     Revert "Merge remote-tracking branch 'upstream/master'"
> >
> >     This reverts commit afb07dacda55f4f378fabf2e55172a95d01e5df4, reversing
> >     changes made to 3f0d14bb1358dfadef65dbd22c8f6d3b89471d49.
> >
> > commit afb07dacda55f4f378fabf2e55172a95d01e5df4
> > Merge: 0c86cf06ed 3f0d14bb13
> > Author: Siyuan Fu <siyuan.fu@intel.com>
> > Date:   Mon Feb 10 11:49:14 2020 +0800
> >
> >     Merge remote-tracking branch 'upstream/master'
> > --------------
> >
> > Reverting the merge commit and adding the changes correctly
> > may be the cleanest way to address.
> >
> > Best regards,
> >
> > Mike
> >
> > > -----Original Message-----
> > > From: Sami Mujawar <sami.mujawar@arm.com>
> > > Sent: Friday, July 29, 2022 1:14 PM
> > > To: Ard Biesheuvel <ardb+tianocore@kernel.org>; edk2-devel-groups-io <devel@edk2.groups.io>; nd@arm.com; Leif Lindholm
> > > <quic_llindhol@quicinc.com>; Kinney, Michael D <michael.d.kinney@intel.com>
> > > Subject: Re: Incorrect push to edk2-platforms
> > >
> > > Adding Leif and Mike.
> > >
> > > On 29/07/2022 08:54 pm, Sami Mujawar wrote:
> > > > Hi Ard,
> > > >
> > > > I have accidentally pushed a change to the edk2-platforms repo.
> > > >
> > > > The commit is
> > > >
> > > > 2faefb2bbcc8083e1bd28908c0b29b5d18595298 <Sami Mujawar> Merge branch
> > > > 'master' of github.com:/tianocore/edk2-platforms
> > > >
> > > > Appologies for the trouble. Can you advise on how this can be fixed,
> > > > please?
> > > >
> > > > Regards,
> > > >
> > > > Sami Mujawar
> > > >
> > > >
> > > >
> > > IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are
> not
> > > the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it
> for
> > > any purpose, or store or copy the information in any medium. Thank you.
> 
> 
> 
>