IRC logs of #mantisbt for Friday, 2014-01-24

« Thursday, 2014-01-23 Index Saturday, 2014-01-25 »
*** kirillka <kirillka!~Miranda@195.242.142.17> has joined #mantisbt01:39
*** dejalexander <dejalexander!~dejalexan@94-194-42-47.zone8.bethere.co.uk> has joined #mantisbt03:16
*** dejalexander <dejalexander!~dejalexan@94-194-42-47.zone8.bethere.co.uk> has quit IRC03:17
*** dejalexa_ <dejalexa_!~dejalexan@94-194-42-47.zone8.bethere.co.uk> has joined #mantisbt03:17
*** YamakasY <YamakasY!~yamakasy@62.58.32.94> has joined #mantisbt03:43
*** dejalexa_ <dejalexa_!~dejalexan@94-194-42-47.zone8.bethere.co.uk> has quit IRC07:24
*** dejalexander <dejalexander!~dejalexan@94-194-42-47.zone8.bethere.co.uk> has joined #mantisbt08:48
*** dejalexander <dejalexander!~dejalexan@94-194-42-47.zone8.bethere.co.uk> has quit IRC08:50
*** dejalexa_ <dejalexa_!~dejalexan@94-194-42-47.zone8.bethere.co.uk> has joined #mantisbt08:50
*** kirillka <kirillka!~Miranda@195.242.142.17> has quit IRC09:00
*** giallu <giallu!~giallu@host229-13-dynamic.8-79-r.retail.telecomitalia.it> has joined #mantisbt10:33
*** giallu <giallu!~giallu@host229-13-dynamic.8-79-r.retail.telecomitalia.it> has quit IRC10:33
*** giallu <giallu!~giallu@fedora/giallu> has joined #mantisbt10:33
*** YamakasY <YamakasY!~yamakasy@62.58.32.94> has quit IRC12:57
*** dejalexa_ <dejalexa_!~dejalexan@94-194-42-47.zone8.bethere.co.uk> has quit IRC13:54
GitHub[mantisbt] siebrand pushed 1 new commit to master-1.2.x: http://git.io/Q0QaIA15:07
GitHubmantisbt/master-1.2.x b72fdae Siebrand Mazeland: Localisation updates from https://translatewiki.net.15:07
*** YamakasY <YamakasY!~yamakasy@62.58.32.94> has joined #mantisbt15:11
*** YamakasY <YamakasY!~yamakasy@62.58.32.94> has quit IRC16:42
*** YamakasY <YamakasY!~yamakasy@g9179.upc-g.chello.nl> has joined #mantisbt16:46
*** YamakasY_ <YamakasY_!~yamakasy@62.58.32.94> has joined #mantisbt16:48
*** YamakasY <YamakasY!~yamakasy@g9179.upc-g.chello.nl> has quit IRC16:50
*** dregad <dregad!~dregad@77-234.193-178.cust.bluewin.ch> has joined #mantisbt17:08
* dregad pokes paulr17:09
*** dejalexander <dejalexander!~dejalexan@94-194-42-47.zone8.bethere.co.uk> has joined #mantisbt17:09
* paulr pokes dregad17:26
dregadthought you went to bed already17:26
paulrno17:26
paulri poked you on skype hours ago ;)17:26
dregador were you just playing minecraft :P17:26
paulrtetris17:26
dregadsounds like youre bored17:26
paulryres17:26
dregadwho plays tetris in 201417:27
*** YamakasY <YamakasY!~yamakasy@g9179.upc-g.chello.nl> has joined #mantisbt17:27
paulr<17:27
dregadthat is so '90s17:27
dregad;)17:27
paulri'm in a strange mood lately :)17:27
dregadso you need my help to fix your github repo17:30
paulrwell17:30
paulrneed to know command line to tell make github acknowledge apull request17:30
paulrI think it's just githubs web interface being crap17:31
*** YamakasY_ <YamakasY_!~yamakasy@62.58.32.94> has quit IRC17:31
dregadmy guess is that you created a new repository instead of forking mantisbt/mantisbt17:31
paulrthe branches I pushed17:32
paulrwere remote branches from mantisbt/mantisbt17:32
paulraka git clone mantisbt/mantis17:32
paulrgit remote add17:32
paulrand git push17:32
paulror whatever it is17:32
dregadbut the question is, how did you create your repo grangeway/mantisbt17:32
paulrgit push!17:33
dregadyou did not first fork it from mantisbt/mantisbt then17:33
* paulr shrugs :)17:33
dregadthat's the reason why you can't do pull requests i think17:34
dregadso i suggest17:34
dregad1. delete  grangeway/mantisbt17:34
dregad2. fork mantisbt/mantisbt https://github.com/mantisbt/mantisbt/fork17:34
dregad3. check remote to your local repo17:35
paulrit might be that i dont have master in the fork17:35
dregadno17:35
dregadit's because github does not consider it as a fork17:35
paulrright, so let me clone17:37
dregaddid you fork it yet ?17:38
dregaduse the link i gave you17:38
paulrwhats the cmd line for fork btw?17:38
dregadit's not command line17:38
dregadit's github web interface17:39
dregadcloning a repo *is* a fork, but not in the github sense17:39
dregadyou see the difference now ? it says "forked from mantisbt/mantisbt" - it did not do that before17:42
dregadso now you add git@github.com:grangeway/mantisbt.git as a remote in your local repo17:43
paulryea, already got that17:43
paulri've put in 2 pull requests so far17:43
*** YamakasY_ <YamakasY_!~yamakasy@62.58.32.94> has joined #mantisbt17:43
*** YamakasY <YamakasY!~yamakasy@g9179.upc-g.chello.nl> has quit IRC17:45
paulrneed to run winmerge against my branches17:50
paulrand also work out how to request CVE's17:50
dregadfor CVE's send a mail to oss security mailing list as per my email earlier this week17:53
paulroh bah17:54
paulrmy local master isn't clean17:54
paulrthat's annoying17:57
*** YamakasY_ <YamakasY_!~yamakasy@62.58.32.94> has quit IRC17:59
dregadwhat do you mean not clean18:00
paulrhad commits in it18:00
dregadreset it18:01
dregadgit co master18:01
dregadgit co -b save-commits18:01
dregadactually make that git br save-commits18:01
dregadthen git reset --hard origin/master18:01
dregadso you have your local commits in another branch and a clean master branch18:02
paulroops18:03
paulrmight have just done that on the wrong local folder /18:04
dregadyou mean you trashed your repo ?18:08
paulrone of them :)18:08
dregadyou know how to use reflog ?18:08
paulrit'll be fine18:09
paulranyway, whts reflog?18:09
dregadhttp://git-scm.com/docs/git-reflog18:10
dregadyour "undo" after stupid git reset --hard commands18:10
dregad;)18:10
paulrtbh, I reset one of my 'fixmess' branches that was trying to merge 2.x and master18:12
paulrso probably fine18:12
paulrhmm18:19
paulrwow18:19
paulr:(18:21
dregadwhat18:22
paulrso much stuff that I fixed in 2.x branch that needs porting to 1.318:22
paulrright, will write a script to automate some of it tomorrow18:23
paulror something18:23
paulrtired now :P18:23
GitHub[mantisbt] dregad pushed 2 new commits to master-1.2.x: http://git.io/dHUDWw18:52
GitHubmantisbt/master-1.2.x 00b4c17 Paul Richards: Fix CVE-2014-1608: mc_issue_attachment_get SQL injection...18:52
GitHubmantisbt/master-1.2.x 7efe017 Paul Richards: Fix CVE-2014-1609: SQL injection vulnerabilities...18:52
GitHub[mantisbt] dregad pushed 2 new commits to master: http://git.io/dvn1YA18:52
GitHubmantisbt/master 3be86ce Paul Richards: Fix CVE-2014-1608: mc_issue_attachment_get SQL injection...18:52
GitHubmantisbt/master 7d76827 Paul Richards: Fix CVE-2014-1609: SQL injection vulnerabilities...18:52
GitHub[mantisbt] dregad pushed 1 new commit to master-1.2.x: http://git.io/EpZTeA18:59
GitHubmantisbt/master-1.2.x cd4847a Damien Regad: Travis: remove notification to mantisbt-cvs list [skip ci]18:59
GitHub[mantisbt] dregad pushed 1 new commit to master: http://git.io/tXCkPQ18:59
GitHubmantisbt/master 56ed4e5 Damien Regad: Travis: remove notification to mantisbt-cvs list [skip ci]18:59
travis-ci[travis-ci] Build #53: dregad/mantisbt fix-16706 (f3d5f60) Damien Regad - The build passed.19:04
travis-ci[travis-ci] Build details: http://travis-ci.org/dregad/mantisbt/builds/1749169119:04
travis-ci[travis-ci] Code Changes: https://github.com/dregad/mantisbt/compare/9f505060d49d^...f3d5f60bbfeb19:04
dregadI'm done for tonight19:22
paulrnn19:23
*** dregad <dregad!~dregad@77-234.193-178.cust.bluewin.ch> has quit IRC19:40
*** YamakasY <YamakasY!~yamakasy@g9179.upc-g.chello.nl> has joined #mantisbt20:00
*** YamakasY <YamakasY!~yamakasy@g9179.upc-g.chello.nl> has quit IRC20:03
*** dejalexander <dejalexander!~dejalexan@94-194-42-47.zone8.bethere.co.uk> has quit IRC20:17
*** intripoon_ <intripoon_!~quassel@manz-4db79a5a.pool.mediaWays.net> has joined #mantisbt21:38
*** intripoon <intripoon!~quassel@manz-5f74a93a.pool.mediaWays.net> has quit IRC21:42
*** YamakasY <YamakasY!~yamakasy@g9179.upc-g.chello.nl> has joined #mantisbt22:01
*** YamakasY <YamakasY!~yamakasy@g9179.upc-g.chello.nl> has quit IRC22:05
« Thursday, 2014-01-23 Index Saturday, 2014-01-25 »

Generated by irclog2html.py 2.13.0 by Marius Gedminas - find it at mg.pov.lt!