Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reverting disaster merge to 593363c5f with diff #2172

Merged
merged 3 commits into from
Jul 30, 2013
Merged

Reverting disaster merge to 593363c5f with diff #2172

merged 3 commits into from
Jul 30, 2013

Commits on Jul 30, 2013

  1. Reverting disaster merge to 593363c with diff 

    There was a disaster of a merge at 6f37cf2 that is particularly
difficult to untangle (it was a bad merge from a long-running local
branch).

What this commit does is simulate a hard reset, by doing thing:

 git checkout -b reset-hard-ohmu
 git reset --hard 593363c
 git checkout upstream-master
 git checkout -b revert-via-diff
 git diff --no-prefix upstream-master..reset-hard-ohmy > patch
 patch -p0 < patch

Since there was one binary change, also did this:

 git checkout upstream-master data/exploits/CVE-2012-1535/Main.swf

Now we have one commit that puts everything back. It screws up
file-level history a little, but it's at least at a point where we can
move on with our lives. Sorry.
    Tod Beardsley committed Jul 30, 2013
    Configuration menu
    Copy the full SHA
    7e53933 View commit details
    Browse the repository at this point in the history

  2. Add Main.swf from 593363c

    Tod Beardsley committed Jul 30, 2013
    Configuration menu
    Copy the full SHA
    9f5f191 View commit details
    Browse the repository at this point in the history

  3. Land #2168 again 

    Adding Dhiru's module back now that things are straight.
    @kholia
    kholia authored and Tod Beardsley committed Jul 30, 2013
    Configuration menu
    Copy the full SHA
    1b6f6b8 View commit details
    Browse the repository at this point in the history