Re: emacs-28 updated (970190b844 -> 41289a9fb9)

Re: emacs-28 updated (970190b844 -> 41289a9fb9)

[Stefan Kangas]

Ouch, this was wrong.  :-/  I'm very sorry about that.

Who has the permissions to help revert this?  I guess these steps
would be necessary:

    git reset --hard 970190b844
    git push -f

I can't do it myself as I get:

$ git push -f
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: error: denying non-fast-forward refs/heads/emacs-28 (you
should pull first)
To git.sv.gnu.org:/srv/git/emacs.git
 ! [remote rejected]       emacs-28 -> emacs-28 (non-fast-forward)
error: failed to push some refs to 'git.sv.gnu.org:/srv/git/emacs.git'

Re: emacs-28 updated (970190b844 -> 41289a9fb9)

[Robert Pluim]

>>>>> On Tue, 26 Jul 2022 15:28:55 +0200, Stefan Kangas <stefankangas@gmail.com> said:

    Stefan> Ouch, this was wrong.  :-/  I'm very sorry about that.
    Stefan> Who has the permissions to help revert this?  I guess these steps
    Stefan> would be necessary:

    Stefan>     git reset --hard 970190b844
    Stefan>     git push -f

    Stefan> I can't do it myself as I get:

    Stefan> $ git push -f
    Stefan> Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
    Stefan> remote: error: denying non-fast-forward refs/heads/emacs-28 (you
    Stefan> should pull first)
    Stefan> To git.sv.gnu.org:/srv/git/emacs.git
    Stefan>  ! [remote rejected]       emacs-28 -> emacs-28 (non-fast-forward)
    Stefan> error: failed to push some refs to 'git.sv.gnu.org:/srv/git/emacs.git'

At least scratch and feature branches can be deleted by pushing, so
maybe

    git reset --hard 970190b844
    git push :emacs-28
    git push

(but Iʼm too chicken to try it :-) )


Robert
-- 

Re: emacs-28 updated (970190b844 -> 41289a9fb9)

[Robert Pluim]

>>>>> On Tue, 26 Jul 2022 16:54:47 +0200, Robert Pluim <rpluim@gmail.com> said:

>>>>> On Tue, 26 Jul 2022 15:28:55 +0200, Stefan Kangas <stefankangas@gmail.com> said:
    Stefan> Ouch, this was wrong.  :-/  I'm very sorry about that.
    Stefan> Who has the permissions to help revert this?  I guess these steps
    Stefan> would be necessary:

    Stefan> git reset --hard 970190b844
    Stefan> git push -f

    Stefan> I can't do it myself as I get:

    Stefan> $ git push -f
    Stefan> Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
    Stefan> remote: error: denying non-fast-forward refs/heads/emacs-28 (you
    Stefan> should pull first)
    Stefan> To git.sv.gnu.org:/srv/git/emacs.git
    Stefan> ! [remote rejected]       emacs-28 -> emacs-28 (non-fast-forward)
    Stefan> error: failed to push some refs to 'git.sv.gnu.org:/srv/git/emacs.git'

    Robert> At least scratch and feature branches can be deleted by pushing, so
    Robert> maybe

    Robert>     git reset --hard 970190b844
    Robert>     git push :emacs-28
    Robert>     git push

    Robert> (but Iʼm too chicken to try it :-) )

And of course that last step should be

    git push origin HEAD:emacs-28

(assuming your remote is called 'origin')

Robert
-- 

Re: emacs-28 updated (970190b844 -> 41289a9fb9)

[Stefan Kangas]

Robert Pluim <rpluim@gmail.com> writes:

>     Robert> At least scratch and feature branches can be deleted by pushing, so
>     Robert> maybe
>
>     Robert>     git reset --hard 970190b844
>     Robert>     git push :emacs-28
>     Robert>     git push
>
>     Robert> (but Iʼm too chicken to try it :-) )
>
> And of course that last step should be
>
>     git push origin HEAD:emacs-28

Thanks, I hope I did this correctly and everything is as it should be.

Re: emacs-28 updated (970190b844 -> 41289a9fb9)

[Stefan Kangas]

If anyone pulled the faulty branch and are having any problems, first run:

    git status

Check that there are no local changes that you want to keep.  If there
are any such changes, make sure to save them on a separate branch or
similar.

Next:

    git fetch
    git reset --hard origin/emacs-28

Again, the "git reset" command above is destructive, so make sure to
check that there are no local changes that you want to keep before
running it.

Re: emacs-28 updated (970190b844 -> 41289a9fb9)

[Robert Pluim]

>>>>> On Tue, 26 Jul 2022 17:07:59 +0200, Stefan Kangas <stefankangas@gmail.com> said:

    Stefan> Robert Pluim <rpluim@gmail.com> writes:
    Robert> At least scratch and feature branches can be deleted by pushing, so
    Robert> maybe
    >> 
    Robert> git reset --hard 970190b844
    Robert> git push :emacs-28
    Robert> git push
    >> 
    Robert> (but Iʼm too chicken to try it :-) )
    >> 
    >> And of course that last step should be
    >> 
    >> git push origin HEAD:emacs-28

    Stefan> Thanks, I hope I did this correctly and everything is as it should be.

Looks fine here:

$ git lg
* 970190b844 (HEAD -> emacs-28, origin/emacs-28) Avoid infloop in
ʼrecenterʼ
|     - Eli Zaretskii <eliz@gnu.org>
* a866674b2a Fix inaccuracies in "lax search" documentation
|     - Eli Zaretskii <eliz@gnu.org>

(although maybe we should disable being able to delete master and
emacs-<number>, and have a hook that disallows >n commits to be pushed
at the same time)

Robert
-- 

Re: emacs-28 updated (970190b844 -> 41289a9fb9)

[Eli Zaretskii]

> From: Stefan Kangas <stefankangas@gmail.com>
> Date: Tue, 26 Jul 2022 15:28:55 +0200
> 
> Ouch, this was wrong.  :-/  I'm very sorry about that.
> 
> Who has the permissions to help revert this?

Next time this happens, ask savannah-hackers-public@gnu.org, they are
the only ones who can do that, AFAIK.