| openstackgerrit | A change was merged to openstack/security-doc: Fixed broken URL for SRG list. https://review.openstack.org/120410 | 00:04 |
|---|---|---|
| openstackgerrit | OpenStack Proposal Bot proposed a change to openstack/security-doc: Updated from global requirements https://review.openstack.org/120653 | 00:31 |
| *** bdpayne has quit IRC | 00:51 | |
| openstackgerrit | Alexandra Settle proposed a change to openstack/security-doc: Clarifying max number of hosts, removing 'technically' https://review.openstack.org/120667 | 01:34 |
| openstackgerrit | Alexandra Settle proposed a change to openstack/security-doc: Clarifying max number of hosts, removing 'technically' https://review.openstack.org/120667 | 01:37 |
| *** voodookid has joined #openstack-security | 01:51 | |
| *** voodookid has quit IRC | 02:10 | |
| *** tmcpeak has quit IRC | 02:22 | |
| *** voodookid has joined #openstack-security | 04:44 | |
| *** voodookid has quit IRC | 05:02 | |
| openstackgerrit | OpenStack Proposal Bot proposed a change to openstack/security-doc: Imported Translations from Transifex https://review.openstack.org/120693 | 06:06 |
| openstackgerrit | A change was merged to openstack/security-doc: Imported Translations from Transifex https://review.openstack.org/120693 | 06:58 |
| openstackgerrit | A change was merged to openstack/security-doc: Updated from global requirements https://review.openstack.org/120653 | 06:59 |
| *** amrith is now known as _amrith_ | 12:28 | |
| *** nkinder has quit IRC | 13:12 | |
| *** bknudson has joined #openstack-security | 13:46 | |
| *** _amrith_ is now known as amrith | 13:49 | |
| *** nkinder has joined #openstack-security | 14:16 | |
| openstackgerrit | Nathan Kinder proposed a change to openstack/security-doc: Adding note for OSSN-0020 https://review.openstack.org/113422 | 14:41 |
| *** voodookid has joined #openstack-security | 15:12 | |
| *** tmcpeak has joined #openstack-security | 15:26 | |
| *** gabriela has joined #openstack-security | 15:43 | |
| *** gabriela has left #openstack-security | 15:44 | |
| *** jimhoagland has joined #openstack-security | 15:45 | |
| *** amrith is now known as _amrith_ | 16:22 | |
| *** salv-orlando has joined #openstack-security | 16:45 | |
| tmcpeak | meeting? | 17:01 |
| *** sicarie has joined #openstack-security | 17:01 | |
| *** nkinder_ has joined #openstack-security | 17:03 | |
| *** nkinder has quit IRC | 17:07 | |
| *** _amrith_ is now known as amrith | 17:39 | |
| *** salv-orlando has quit IRC | 17:42 | |
| *** openstackgerrit has quit IRC | 17:46 | |
| *** openstackgerrit has joined #openstack-security | 17:47 | |
| tmcpeak | nkinder: got a minute? | 17:49 |
| nkinder_ | tmcpeak: sure | 17:49 |
| tmcpeak | I've gotten myself into some BS with Git/GitHub | 17:49 |
| tmcpeak | check this out: https://github.com/mcpeak/bandit/compare/chair6:master...master | 17:50 |
| tmcpeak | I want to push these changes to chair6's repo | 17:50 |
| tmcpeak | but it's 5 commits | 17:50 |
| tmcpeak | and some of them have horrible messages | 17:50 |
| tmcpeak | can I somehow just blow away all of them, or all except the last? | 17:50 |
| tmcpeak | it's my own repo and nobody uses it but me | 17:51 |
| tmcpeak | so I could just "re-write history" as they always say | 17:51 |
| tmcpeak | nkinder_: what's the best way to do it? | 17:53 |
| nkinder_ | tmcpeak: you need to squash them | 17:54 |
| nkinder_ | squash == merge multiple patches into one | 17:54 |
| nkinder_ | tmcpeak: so I haven't tried to nuke commits that have been pushed to github, but I've done it with private git repos before | 17:55 |
| nkinder_ | tmcpeak: it's the -f option IIRC | 17:55 |
| tmcpeak | nkinder_: ok, yeah I saw something like that | 17:56 |
| nkinder_ | tmcpeak: during the 'git push' | 17:56 |
| nkinder_ | tmcpeak: so you would squash the commits in your local clone of master, then 'git push -f' them | 17:56 |
| nkinder_ | tmcpeak: let me clone your repo and see if I can get you some specifics | 17:56 |
| tmcpeak | nkinder_: thank you! | 17:57 |
| tmcpeak | nkinder_: it looks like this might work: http://stackoverflow.com/questions/448919/how-can-i-remove-a-commit-on-github | 17:58 |
| chair6 | http://justinhileman.info/article/git-pretty/full/ | 17:58 |
| tmcpeak | chair6: yeah, that's right, I forgot about this diagram :) | 17:59 |
| tmcpeak | chair6: so I guess technically you are downstream, but you aren't enough to form a lynchmob | 18:00 |
| nkinder_ | tmcpeak: so how many commits do you want to squash? | 18:00 |
| tmcpeak | nkinder_: 5 | 18:00 |
| chair6 | i'm generally pretty chill, probably no lynchings here | 18:01 |
| tmcpeak | but I report to you, so there is that :D | 18:01 |
| nkinder_ | tmcpeak: so usually, you do something like "git rebase -i HEAD~5" to perform an interactive rebase | 18:03 |
| nkinder_ | that will bring up an editor where you can choose what to do with the last 5 patches | 18:04 |
| nkinder_ | you replace "pick" with the action you want to perform | 18:04 |
| tmcpeak | it looks like what I have in status locally now is correct | 18:04 |
| tmcpeak | so it looks like I could do: git push origin +master | 18:05 |
| tmcpeak | except I'm on "no branch" | 18:06 |
| nkinder_ | tmcpeak: you have some revert commits in there, and commits with the same title. Which ones cancel each other out? | 18:09 |
| tmcpeak | nkinder_: there should really only be one commit | 18:09 |
| tmcpeak | it doesn't matter | 18:09 |
| tmcpeak | last one would be fine | 18:09 |
| nkinder_ | tmcpeak: for all of the random.random ones you mean? | 18:09 |
| tmcpeak | nkinder_: yep | 18:09 |
| nkinder_ | tmcpeak: so you want the SQL injection one followed by the last random.random one | 18:09 |
| nkinder_ | tmcpeak: ok, so on master, do a 'git rebase -i HEAD~5' | 18:11 |
| nkinder_ | tmcpeak: when the editor comes up, comment out the commits you want to delete. It should look like this: http://paste.openstack.org/show/110264/ | 18:11 |
| nkinder_ | tmcpeak: then save the editor and it will perform the rebase | 18:11 |
| tmcpeak | nkinder_: I've done some messing around, and I have it correct locally now | 18:11 |
| nkinder_ | tmcpeak: confirm it with git log -3 | 18:11 |
| tmcpeak | nkinder_: yep, all is fine | 18:12 |
| tmcpeak | LOCALLY | 18:12 |
| nkinder_ | tmcpeak: ok, so git push -f to master as usual (but with the -f to force) | 18:12 |
| nkinder_ | tmcpeak: assuming github allows that, you should be good | 18:12 |
| tmcpeak | nkinder_: perfect! | 18:13 |
| tmcpeak | I'm saved | 18:13 |
| tmcpeak | thank you sir | 18:13 |
| tmcpeak | chair6: pull request coming at you | 18:13 |
| nkinder_ | tmcpeak: sure. Play around with 'git rebase -i'. It's really powerful. | 18:13 |
| tmcpeak | yeah, and "git status" and "git log" are you friends | 18:13 |
| tmcpeak | nkinder_: I'm learning to panic less when I get in these situations | 18:14 |
| nkinder_ | tmcpeak: and STOP WORKING ON MASTER ;) | 18:16 |
| tmcpeak | haha yeah | 18:16 |
| tmcpeak | crap habit | 18:16 |
| nkinder_ | tmcpeak: but yes, you can get out of most situations | 18:16 |
| chair6 | merged it up.. interesting test, looking at https://docs.python.org/2/library/random.html there are a few other things we should be checking for as well | 18:17 |
| *** dmccowan has joined #openstack-security | 18:24 | |
| *** Guest75250 has quit IRC | 19:14 | |
| *** nkinder_ has quit IRC | 19:23 | |
| *** mgagne has joined #openstack-security | 19:51 | |
| *** amrith is now known as notamcrn | 19:58 | |
| *** notamcrn is now known as amrith | 19:59 | |
| *** nkinder_ has joined #openstack-security | 20:11 | |
| *** amrith is now known as _amrith_ | 21:27 | |
| *** dmccowan has quit IRC | 21:29 | |
| openstackgerrit | Rudrajit Tapadar proposed a change to openstack/security-doc: Add references to NIST publications in Chapter 40 https://review.openstack.org/120920 | 21:49 |
| *** dmccowan has joined #openstack-security | 21:52 | |
| openstackgerrit | Rudrajit Tapadar proposed a change to openstack/security-doc: Add references to NIST publications in Chapter 40 https://review.openstack.org/120920 | 21:52 |
| *** dmccowan_ has joined #openstack-security | 22:09 | |
| *** dmccowan has quit IRC | 22:09 | |
| *** dmccowan_ is now known as dmccowan | 22:09 | |
| *** openstackgerrit has quit IRC | 22:38 | |
| *** openstackgerrit_ has joined #openstack-security | 22:38 | |
| *** bknudson has quit IRC | 22:39 | |
| *** openstackgerrit_ is now known as openstackgerrit | 22:40 | |
| *** voodookid has quit IRC | 23:06 | |
| *** jimhoagland has quit IRC | 23:09 | |
| *** _amrith_ is now known as amrith | 23:40 | |
| openstackgerrit | Alexandra Settle proposed a change to openstack/security-doc: Clarifying max number of hosts, removing 'technically' https://review.openstack.org/120667 | 23:48 |
| *** sicarie has quit IRC | 23:59 | |
Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!