[Emms-patches] Re: Sorry ...

[Tim Landscheidt]

I wrote:

>>> ... I screwed up. I tried very hard to push only changes to
>>> the autotools branch, even using a temporary clone in a dif-
>>> ferent directory, but somehow my scratchpad got pushed as
>>> well.

>>>   If someone has the knowledge and karma to reset the master
>>> branch to the last "good" commit, I'd be eternally grateful.

>> I'm no git expert so I won't try to undo whatever, but isn't this what
>> "git reset --hard [UUID]" is for?

> Locally? Probably. But will a subsequent push reset the re-
> pository master as well?

Okay, I've done some testing with a remote repository. "git
reset --hard $UUID && git push" will fail with:

|  ! [rejected]        master -> master (non-fast forward)

but the already mentioned:

| git push origin +a4d7a62c0fc38ef5ce7b1b68f493b552d835214f:master

will work just fine as far as I can tell (you could probably
combine both, i. e. "git reset --hard $UUID && git push
origin +:master", but I find the explicit naming of the com-
mit to reset to much more affirmative :-)).

  If no one objects, I'd like to go ahead with this tomorrow
(Friday) afternoon UTC. (I have made a backup copy of the
repository :-).)

Sorry again for the disturbance,
Tim