How do I undo this commit?

https://github.com/D-Programming-Language/dmd/commit/6f344e7abbc922b51bb0aeaa6fe7261a4ca1826f

Not sure how it happened. I was trying to fix dmd/test/fail_compilation/testCols.d which has CRLFs in it which completely screw up git.
_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals

Probably best to just leave it there now.  It doesn't seem to have broken anything.

You can make this mistake impossible to make by changing upstream to read-only and using a different remote name (or just the full url) for the rare times when actually pushing to upstream is required.


On Fri, Feb 21, 2014 at 7:04 PM, Walter Bright <walter@digitalmars.com>wrote:

> How do I undo this commit?
>
> https://github.com/D-Programming-Language/dmd/commit/ 6f344e7abbc922b51bb0aeaa6fe7261a4ca1826f
>
> Not sure how it happened. I was trying to fix dmd/test/fail_compilation/testCols.d
> which has CRLFs in it which completely screw up git.
> _______________________________________________
> dmd-internals mailing list
> dmd-internals@puremagic.com
> http://lists.puremagic.com/mailman/listinfo/dmd-internals
>

On 2/21/2014 12:04 AM, Walter Bright wrote:
> How do I undo this commit?
>
> https://github.com/D-Programming-Language/dmd/commit/6f344e7abbc922b51bb0aeaa6fe7261a4ca1826f 
>
>
> Not sure how it happened. I was trying to fix dmd/test/fail_compilation/testCols.d which has CRLFs in it which completely screw up git.

Ok, which one do I do:

git rebase -i HEAD~2
git push origin +master

or:

git reset --soft HEAD^
git push origin +master

?




_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals

Depends on what you are trying to do?

The commit is already in upstream/master, so I don't suggest removing it now.

If you really want to undo it, use git revert on the merge commit.

Using rebase or reset on master will rewrite the public history, which at least two people have already pulled.


On Fri, Feb 21, 2014 at 7:21 PM, Walter Bright <walter@digitalmars.com>wrote:

>
> On 2/21/2014 12:04 AM, Walter Bright wrote:
>
>> How do I undo this commit?
>>
>> https://github.com/D-Programming-Language/dmd/commit/ 6f344e7abbc922b51bb0aeaa6fe7261a4ca1826f
>>
>> Not sure how it happened. I was trying to fix dmd/test/fail_compilation/testCols.d which has CRLFs in it which completely screw up git.
>>
>
> Ok, which one do I do:
>
> git rebase -i HEAD~2
> git push origin +master
>
> or:
>
> git reset --soft HEAD^
> git push origin +master
>
>
> ?
>
>
>
>
> _______________________________________________
> dmd-internals mailing list
> dmd-internals@puremagic.com
> http://lists.puremagic.com/mailman/listinfo/dmd-internals
>

On 2/21/2014 12:21 AM, Walter Bright wrote:
>
> git reset --soft HEAD^
> git push origin +master

Did this one. Seems to have worked.
_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals

Good work - you accidentally pushed to master then made things worse by rewriting history.


On Fri, Feb 21, 2014 at 7:28 PM, Daniel Murphy <yebblies@gmail.com> wrote:

> Depends on what you are trying to do?
>
> The commit is already in upstream/master, so I don't suggest removing it now.
>
> If you really want to undo it, use git revert on the merge commit.
>
> Using rebase or reset on master will rewrite the public history, which at least two people have already pulled.
>
>
> On Fri, Feb 21, 2014 at 7:21 PM, Walter Bright <walter@digitalmars.com>wrote:
>
>>
>> On 2/21/2014 12:04 AM, Walter Bright wrote:
>>
>>> How do I undo this commit?
>>>
>>> https://github.com/D-Programming-Language/dmd/commit/ 6f344e7abbc922b51bb0aeaa6fe7261a4ca1826f
>>>
>>> Not sure how it happened. I was trying to fix dmd/test/fail_compilation/testCols.d which has CRLFs in it which completely screw up git.
>>>
>>
>> Ok, which one do I do:
>>
>> git rebase -i HEAD~2
>> git push origin +master
>>
>> or:
>>
>> git reset --soft HEAD^
>> git push origin +master
>>
>>
>> ?
>>
>>
>>
>>
>> _______________________________________________
>> dmd-internals mailing list
>> dmd-internals@puremagic.com
>> http://lists.puremagic.com/mailman/listinfo/dmd-internals
>>
>
>

I've fixed it, please stop pushing to upstream.


On Fri, Feb 21, 2014 at 7:42 PM, Daniel Murphy <yebblies@gmail.com> wrote:

> Good work - you accidentally pushed to master then made things worse by rewriting history.
>
>
> On Fri, Feb 21, 2014 at 7:28 PM, Daniel Murphy <yebblies@gmail.com> wrote:
>
>> Depends on what you are trying to do?
>>
>> The commit is already in upstream/master, so I don't suggest removing it now.
>>
>> If you really want to undo it, use git revert on the merge commit.
>>
>> Using rebase or reset on master will rewrite the public history, which at least two people have already pulled.
>>
>>
>> On Fri, Feb 21, 2014 at 7:21 PM, Walter Bright <walter@digitalmars.com>wrote:
>>
>>>
>>> On 2/21/2014 12:04 AM, Walter Bright wrote:
>>>
>>>> How do I undo this commit?
>>>>
>>>> https://github.com/D-Programming-Language/dmd/commit/ 6f344e7abbc922b51bb0aeaa6fe7261a4ca1826f
>>>>
>>>> Not sure how it happened. I was trying to fix dmd/test/fail_compilation/testCols.d which has CRLFs in it which completely screw up git.
>>>>
>>>
>>> Ok, which one do I do:
>>>
>>> git rebase -i HEAD~2
>>> git push origin +master
>>>
>>> or:
>>>
>>> git reset --soft HEAD^
>>> git push origin +master
>>>
>>>
>>> ?
>>>
>>>
>>>
>>>
>>> _______________________________________________
>>> dmd-internals mailing list
>>> dmd-internals@puremagic.com
>>> http://lists.puremagic.com/mailman/listinfo/dmd-internals
>>>
>>
>>
>

No, you screwed it up worse.  I fixed it.  Please don't do this again.


On Fri, Feb 21, 2014 at 7:40 PM, Walter Bright <walter@digitalmars.com>wrote:

>
> On 2/21/2014 12:21 AM, Walter Bright wrote:
>
>>
>> git reset --soft HEAD^
>> git push origin +master
>>
>
> Did this one. Seems to have worked.
>
> _______________________________________________
> dmd-internals mailing list
> dmd-internals@puremagic.com
> http://lists.puremagic.com/mailman/listinfo/dmd-internals
>

On 2/21/2014 1:02 AM, Daniel Murphy wrote:
> No, you screwed it up worse.  I fixed it.  Please don't do this again.
>

How so? I did a refresh on the github commit list, and the bad commit vanished.
_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals

On 2/21/2014 12:46 AM, Daniel Murphy wrote:
> I've fixed it, please stop pushing to upstream.
>

Thanks for fixing it. Our emails seem to have crossed - I didn't know you had fixed it when I tried to fix it. I find that strange, as I did a refresh on it first.
_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals