Open Letter of Apology

[Blair Zajac]

git revert with the beginning and ending commits?

> On Apr 27, 2018, at 6:59 PM, Perry E. Metzger <pmetzger at macports.org> wrote:
> 
> So I tried to do some repo surgery to fix Marcus Calhoun-Lopez's
> commits, since there were only two commits after his change.
> 
> I "git reset --hard" back past where he damaged the repo, cherry
> picked the two revisions after that, and then tried to
> "git push --force" -- this should have re-set the master branch to
> point at a slightly different history that now didn't include Marcus'
> changes.
> 
> However (I suppose not so sadly, since force pushes are dangerous), I got a 
>   error: GH006: Protected branch update failed for refs/heads/master.
>   remote: error: Cannot force-push to a protected branch
> 
> I think this is a github security feature. But I can't do appropriate
> repository surgery without it.
> 
> Anyone have suggestions for alternatives? Should we just merge a
> reversal? (I may do that temporarily anyway.)
> 
> Perry
> 
> 
> On Fri, 27 Apr 2018 18:26:00 -0700 Marcus Calhoun-Lopez
> <mcalhoun at macports.org> wrote:
>> Unfortunately, there were 17 commits in total.
>> They are:
>> https://github.com/macports/macports-ports/commit/ad74231453310610fd7432adb93fb5110ad4157d
>> https://github.com/macports/macports-ports/commit/8129b740cee3af8924b19df302ca1ab5cc2c5be1
>> https://github.com/macports/macports-ports/commit/ef8a319b93196a8c24bc0ea786ceccdc72e2932a
>> https://github.com/macports/macports-ports/commit/2018e17bae76928704d88088e220dc036222a0f4
>> https://github.com/macports/macports-ports/commit/43fa62e3cd97c26170da5f061717b18ed41f8d7e
>> https://github.com/macports/macports-ports/commit/903a0f42ee73a1794f1bdb454d295bf27f16237e
>> https://github.com/macports/macports-ports/commit/ca60330d222f981707c1277b023b044176f0d47f
>> https://github.com/macports/macports-ports/commit/effc2886cf0bee00532024aa043b3fd3415d74cc
>> https://github.com/macports/macports-ports/commit/68a34f577814e3e5b3f444530262b109093da515
>> https://github.com/macports/macports-ports/commit/e3bd4e336adc623e396a0b9495b578a1a3cf2452
>> https://github.com/macports/macports-ports/commit/ab5c006fb4dc9bdf81be0516bf43bf6254f92f0b
>> https://github.com/macports/macports-ports/commit/ecb4c4162ecd507cf6edcb85d39958912304a78c
>> https://github.com/macports/macports-ports/commit/00388e9305f5189b9bfc3b5442e92c1b8766b883
>> https://github.com/macports/macports-ports/commit/d911e14f64df12efbcbdffa461da0337dbca1226
>> https://github.com/macports/macports-ports/commit/20e585feb55340dfe2a45d236f90fd2edecdb3e4
>> https://github.com/macports/macports-ports/commit/968ddf5b34bbba587c5c1335c24d79bb8e4ea481
>> https://github.com/macports/macports-ports/commit/24864aeda99bedbc183f882878df70e8b555aa0b
>> 
>>> On Apr 27, 2018, at 5:47 PM, Perry E. Metzger
>>> <pmetzger at macports.org> wrote:
>>> 
>>> On Fri, 27 Apr 2018 16:33:23 -0700 Marcus Calhoun-Lopez
>>> <mcalhoun at macports.org> wrote:  
>>>> Recently, I made some major changes to the cargo PortGroup and
>>>> the Portfiles of several people. My intent was:
>>>> 	*) create a branch
>>>> 	*) solicit feedback on the branch with the changes
>>>> 
>>>> Instead, I pushed the changes to master.
>>>> It was very careless of me, and I sincerely apologize to all
>>>> those I have inconvenienced.
>>>> 
>>>> I would like to mitigate my error as much as possible.
>>>> Does anyone know of an easy was to rollback my changes?
>>>> I am afraid my inability to correctly use Git is what caused this
>>>> problem in the first place.  
>>> 
>>> Can you identify the set of commits in question? If you can tell
>>> us their identifiers, we can reverse them quite easily.
>>> 
>>> In the future, you might try forking the repository into your own
>>> GitHub account and checking *that* out in order to play with the
>>> operations you need to perform.  
>> 
>> Thank you for the advice.
>> If I understand correctly, doing this will the allow me to make use
>> of pull requests (https://guide.macports.org/#project.github) to
>> make final commits.
>> 
>> -Marcus
>> 
> 
> 
> 
> -- 
> Perry E. Metzger		pmetzger at macports.org
>