ChanServ changed the topic of #crystal-lang to: The Crystal programming language | http://crystal-lang.org | Crystal 0.23.1 | Fund Crystal's development: http://is.gd/X7PRtI | GH: https://github.com/crystal-lang/crystal | Docs: http://crystal-lang.org/docs/ | API: http://crystal-lang.org/api/ | Gitter: https://gitter.im/crystal-lang/crystal
rohitpaulk has quit [Ping timeout: 240 seconds]
vegai has joined #crystal-lang
braidn[m] has joined #crystal-lang
thelonelyghost has joined #crystal-lang
TheGillies has joined #crystal-lang
jplatte has joined #crystal-lang
krigare[m] has joined #crystal-lang
Lex[m] has joined #crystal-lang
werthen[m] has joined #crystal-lang
sija[m] has joined #crystal-lang
<Papierkorb> oprypin: Ah well. libTooling/Clang it is.
<Papierkorb> Good thing linking anything against llvm and clang doesn't take ages /s
<crystal-gh> [crystal] MakeNowJust opened pull request #4763: YAML: correctly parse scalar value having null character (master...fix/yaml/null-safe-scalar) https://git.io/v78eK
DTZUZO has quit [Read error: Connection reset by peer]
Philpax has joined #crystal-lang
deep-book-gk has joined #crystal-lang
deep-book-gk has left #crystal-lang [#crystal-lang]
<FromGitter> <picatz> Crystal has been so much fun this weekend.
<FromGitter> <picatz> I made some progress on: https://github.com/picatz/argz
<FromGitter> <picatz> Building it solely to help myself learn Crystal / have something to build command-line applications out of it.
alibby1 has joined #crystal-lang
alibby has quit [Ping timeout: 240 seconds]
DTZUZO has joined #crystal-lang
alibby has joined #crystal-lang
alibby1 has quit [Ping timeout: 240 seconds]
alibby1 has joined #crystal-lang
alibby has quit [Ping timeout: 240 seconds]
rohitpaulk has joined #crystal-lang
alibby has joined #crystal-lang
alibby1 has quit [Read error: Connection reset by peer]
<FromGitter> <drujensen> Crystal does bring back the joy that we all felt when we first used ruby.
<FromGitter> <elorest> yeah.
DTZUZO has quit [Quit: WeeChat 1.9]
DTZUZO has joined #crystal-lang
rohitpaulk has quit [Ping timeout: 240 seconds]
<FromGitter> <picatz> I didn't touch ruby once this weekend. Just did Crystal. Well, I also worked on converting a ruby project to Crystal -- but, whatever. It is great!
<FromGitter> <kazzkiq> How to transform a MySql::ResultSet into a JSON::any?
<FromGitter> <kazzkiq> I'm trying to simply use `.to_json` in my query results, but getting an error
_whitelogger has joined #crystal-lang
<FromGitter> <codenoid> hi, how to pass `Incorrect string value: '\xC5\xB7 is ...' for column 'content' at row 1 (Exception)`
snsei has joined #crystal-lang
_whitelogger has joined #crystal-lang
GK1wmSU has joined #crystal-lang
GK1wmSU has left #crystal-lang [#crystal-lang]
_GK1wmSU has joined #crystal-lang
_GK1wmSU has left #crystal-lang [#crystal-lang]
tzekid has joined #crystal-lang
mark_66 has joined #crystal-lang
flaviodesousa has joined #crystal-lang
<crystal-gh> [crystal] ysbaddaden pushed 1 new commit to master: https://git.io/v78c9
<crystal-gh> crystal/master f387380 TSUYUSATO Kitsune: Correctly work __has_color check in bin/crystal
<travis-ci> crystal-lang/crystal#f387380 (master - Correctly work __has_color check in bin/crystal): The build passed. https://travis-ci.org/crystal-lang/crystal/builds/259272107
<FromGitter> <watzon> Out of curiosity, what’s the state of compiling Crystal code in Windows?
<travis-ci> crystal-lang/crystal#f387380 (master - Correctly work __has_color check in bin/crystal): The build passed. https://travis-ci.org/crystal-lang/crystal/builds/259272107
<travis-ci> crystal-lang/crystal#f387380 (master - Correctly work __has_color check in bin/crystal): The build passed. https://travis-ci.org/crystal-lang/crystal/builds/259272107
<crystal-gh> [crystal] ysbaddaden closed pull request #4763: YAML: correctly parse scalar value having null character (master...fix/yaml/null-safe-scalar) https://git.io/v78eK
bjz has joined #crystal-lang
<FromGitter> <Qwerp-Derp> I'm getting an error with this code: ⏎ ⏎ ```macro test(fn) ⏎ 5 {{ fn }} 10 ⏎ end ⏎ ⏎ puts test(+)``` [https://gitter.im/crystal-lang/crystal?at=597ef071bc464729743d729b]
<FromGitter> <oprypin> @Qwerp-Derp `+` by itself is not valid code
<FromGitter> <straight-shoota> You can use `:+` and `{{fn.id}}`
<travis-ci> crystal-lang/crystal#5b71ddf (master - YAML: correctly parse scalar value having null character): The build passed. https://travis-ci.org/crystal-lang/crystal/builds/259284753
<travis-ci> crystal-lang/crystal#5b71ddf (master - YAML: correctly parse scalar value having null character): The build passed. https://travis-ci.org/crystal-lang/crystal/builds/259284753
<FromGitter> <bararchy> We need more people approved to check PR's and merge , I see lots of PR's getting stale and conflicated just because they are not getting looked at
<FromGitter> <watzon> Sweet. Thanks @oprypin
<FromGitter> <watzon> Another question, I see a PR from 2 years ago about adding a singleton module, but has there been any movement on anything like that. They also mentioned thinking about adding actors which, after a small foray into elixir, I think could be an awesome idea
<FromGitter> <watzon> @bararchy I’m going to see if there’s anything I can do tomorrow. I’ve got a mostly free day other than a personal project I’m working on
<FromGitter> <bararchy> @watzon Cool :) thanks
<FromGitter> <watzon> Actually I misunderstood your post at first haha. I’m going to see if there’s anything I can do to get issues closed though
<FromGitter> <bararchy> haha, closing issues is not less importent ;)
<FromGitter> <watzon> I feel like I should put a little effort into the language itself. Haven’t done much on it yet
<FromGitter> <bararchy> You can join the triage program
<FromGitter> <watzon> @bararchy done and done :)
<FromGitter> <bararchy> 👍
<FromGitter> <bararchy> Thanks dude
<FromGitter> <watzon> @bararchy no problem, hopefully I can be of some help
<FromGitter> <bararchy> @RX14 Thanks for reviewing the issue :)
bjz has quit [Quit: My MacBook Pro has gone to sleep. ZZZzzz…]
<FromGitter> <bararchy> Who uses Travis as CI for there Cryystal projects ?
<FromGitter> <bararchy> except master Crystal
<FromGitter> <sdogruyol> I use it for Kemal :P
<FromGitter> <sdogruyol> not for a closed project yet
<FromGitter> <bararchy> That's cool. stealing your travis file
<FromGitter> <bararchy> :)
<FromGitter> <straight-shoota> `language: crystal` should be it in most cases :D
<FromGitter> <sdogruyol> hehe
<FromGitter> <straight-shoota> there are currently no nightly builds of crystal, so the other lines in Kemal travis config don't work at the moment
<FromGitter> <straight-shoota> btw: travis can also automatically build API docs for you and deploy them to Github pages. I've put it into a script: https://github.com/straight-shoota/autodeploy-docs
rohitpaulk has joined #crystal-lang
<FromGitter> <watzon> @straight-shoota what would it take for us to start having nightly builds of Crystal?
<FromGitter> <watzon> Out of curiosity mainly
<FromGitter> <sdogruyol> I'd be really curious to see a Crystal version of this https://aadrake.com/posts/2017-05-29-faster-command-line-tools-with-go.html
<RX14> it would require me to finish CI @watzon
<FromGitter> <sdogruyol> Anyone willing to help :P ?
<RX14> which I have put on hold for a while now...
bjz has joined #crystal-lang
<FromGitter> <straight-shoota> nightly builds would be great. But there are also lot's of other important issues...
<FromGitter> <watzon> @sdogruyol looks like math to me.. 😕
<FromGitter> <watzon> That being said, I’d definitely like to see the result
<FromGitter> <sdogruyol> Yep
rohitpaulk has quit [Ping timeout: 276 seconds]
<w-p> is there any significant memory overhead for union types?
<w-p> or is the type declaration only relevant to the compiler?
<FromGitter> <straight-shoota> @w-p IIRC it's just an Int32 to store the type id
rohitpaulk has joined #crystal-lang
<FromGitter> <straight-shoota> @sdogruyol sounds like fun to do this in Crystal :D and it shouldn't be to complicated (and I expect quite fast) with IO and Char::Reader
<FromGitter> <konovod> IIRC +sum of type sizes, not like in C union.
<w-p> so for example `x : Bool | Int16` vs `y : String | Int32 | Float32`
<w-p> rather `x : Bool | Int32` vs `y : Int32 | Float32`
rohitpaulk has quit [Ping timeout: 255 seconds]
TheGillies has quit [Ping timeout: 255 seconds]
<FromGitter> <konovod> hm, looks like i'm wrong.https://carc.in/#/r/2gcy
olbat[m] has quit [Ping timeout: 246 seconds]
krigare[m] has quit [Ping timeout: 240 seconds]
braidn[m] has quit [Ping timeout: 240 seconds]
Lex[m] has quit [Ping timeout: 246 seconds]
vegai has quit [Ping timeout: 246 seconds]
sija[m] has quit [Ping timeout: 240 seconds]
werthen[m] has quit [Ping timeout: 246 seconds]
jplatte has quit [Ping timeout: 255 seconds]
thelonelyghost has quit [Ping timeout: 276 seconds]
<w-p> interesting...
<FromGitter> <sdogruyol> that might be the size of `Union` itself
<FromGitter> <sdogruyol> better https://play.crystal-lang.org/#/r/2gds
<w-p> right. but by virtue of the fact that it uses a union type - there is no additional overhead.
<FromGitter> <sdogruyol> no overhead, just a demonstration :P
<w-p> i appreciate it.
<FromGitter> <straight-shoota> @sdogruyol https://play.crystal-lang.org/#/r/2gdx
<FromGitter> <straight-shoota> with `a = 5` you limit a's type to Int32
<FromGitter> <sdogruyol> yeah :)
<FromGitter> <sdogruyol> well an Union type has the size of the probable maximum element which is really obvious
bjz_ has joined #crystal-lang
bjz has quit [Ping timeout: 258 seconds]
rohitpaulk has joined #crystal-lang
<FromGitter> <sdogruyol> so I've just tried how many `send` can a channel handle https://gist.github.com/sdogruyol/52819e608a3291aa5146254bb298d321
<FromGitter> <sdogruyol> Getting like 15.72M on a MBP 13 which is pretty cool
<FromGitter> <watzon> 👍 😁
<FromGitter> <watzon> Curious, how many people here work at Manas or use to?
<FromGitter> <sdogruyol> at around 6-7 or so
<FromGitter> <watzon> Do you @sdogruyol ?
<FromGitter> <sdogruyol> Nope :) I don't work for Manas
<FromGitter> <watzon> Ahh haha. Just curious to see how many of the core contributors are employees there. Seems like a good place to work
<FromGitter> <sdogruyol> Most of the core developers are from Manas.
<FromGitter> <watzon> Awesome 😊
rohitpaulk has quit [Ping timeout: 255 seconds]
rohitpaulk has joined #crystal-lang
<FromGitter> <straight-shoota> if someone is interested in fast command line tools in crystal: https://gist.github.com/straight-shoota/219eb51e741bb9c57849683ae623dd36
rohitpaulk has quit [Ping timeout: 260 seconds]
<FromGitter> <sdogruyol> @straight-shoota wow. How's it?
<crystal-gh> [crystal] MakeNowJust opened pull request #4765: Don't find in CRYSTAL_PATH if required path is relative (master...fix/crystal/not-find-crystal-path-if-relative) https://git.io/v785L
<FromGitter> <straight-shoota> you know my crappy Ubuntu on Windows :D
rohitpaulk has joined #crystal-lang
<FromGitter> <straight-shoota> ```code paste, see link``` [https://gitter.im/crystal-lang/crystal?at=597f3323614889d47506c71d]
<FromGitter> <sdogruyol> I'm really curious how it perform against others :D
<FromGitter> <straight-shoota> installing go right now
<FromGitter> <sdogruyol> 🔥
<FromGitter> <straight-shoota> Comparing *V4: Stop using strings* from https://aadrake.com/posts/2017-05-29-faster-command-line-tools-with-go.html with my *IntParser*: ⏎ ⏎ ```code paste, see link``` [https://gitter.im/crystal-lang/crystal?at=597f39651c8697534a763e7a]
<FromGitter> <sdogruyol> wow
<FromGitter> <sdogruyol> Crystal is really good at benchmarks
<FromGitter> <sdogruyol> you should write a blog post :) @straight-shoota
<FromGitter> <straight-shoota> yeah, I probably should
snsei has quit [Remote host closed the connection]
flaviodesousa has quit [Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/]
Philpax has quit [Ping timeout: 240 seconds]
olbat[m] has joined #crystal-lang
<RX14> @straight-shoota for the Benchmark.ips you'd be much better loading the entire file into memory first
<RX14> not opening the file every single iteration
<RX14> actually if each iteration is greater than 50ms then don't bother
<FromGitter> <straight-shoota> the iterations take a lot longer :D
<RX14> oh ok then
<RX14> i think the array version is about optimal
<RX14> what does the go version with the updated code from reddit compare
<FromGitter> <straight-shoota> and loading all data into memory was not considered for the benchmark anyway, because it could be assumed that the data stream is arbitrary large
<RX14> if you do a smiliar in-language iterative benchmark
bjz_ has quit [Ping timeout: 240 seconds]
<RX14> yes you couldn't design your code such that it required everything in memory
<RX14> but you could put the stream in memory
<RX14> and in fact it will be in the OS cache which is in memory
<FromGitter> <straight-shoota> yeah
<RX14> see how much of a difference it makes
<RX14> i'm interested
<FromGitter> <straight-shoota> the Array implementation has good speed but it makes assumptions about the data
<RX14> what assumptions?
<RX14> that there are few fields?
<FromGitter> <straight-shoota> that the highest key is 2008
<RX14> how does the data look again?
<RX14> is it just k,v pairs
<RX14> ?
<FromGitter> <straight-shoota> ```code paste, see link``` [https://gitter.im/crystal-lang/crystal?at=597f4644614889d475071c72]
<FromGitter> <straight-shoota> it's a row of N fields and you can configure which one is the key and which the value. the samples use 1 and 2
<RX14> oh ok
<RX14> here's a trick
<RX14> allocate half a l2 cache of int32 array
<RX14> anything larger than that goes in a hashmap
<RX14> fast for small keys, works with large keys
<RX14> my l2 cache is 256k
<RX14> so 128k of array
<RX14> 2^17 / 4 is 32768 keys
<RX14> 32768 i32s
<FromGitter> <straight-shoota> yeah, that's some optimization ;)
braidn[m] has joined #crystal-lang
vegai has joined #crystal-lang
krigare[m] has joined #crystal-lang
jplatte has joined #crystal-lang
thelonelyghost has joined #crystal-lang
TheGillies has joined #crystal-lang
Lex[m] has joined #crystal-lang
sija[m] has joined #crystal-lang
werthen[m] has joined #crystal-lang
<RX14> @straight-shoota i think you could easilly use 4096 for MAX_KEY and stay within l1
snsei has joined #crystal-lang
Split has joined #crystal-lang
rohitpaulk has quit [Ping timeout: 240 seconds]
Split_ has joined #crystal-lang
snsei has quit [Ping timeout: 246 seconds]
<FromGitter> <straight-shoota> ok
Split__ has joined #crystal-lang
Split has quit [Ping timeout: 240 seconds]
Split_ has quit [Ping timeout: 240 seconds]
Split__ has quit [Ping timeout: 248 seconds]
rohitpaulk has joined #crystal-lang
<FromGitter> <straight-shoota> somehow the naive implementation is sometimes even faster than the custom parser :D
mark_66 has quit [Remote host closed the connection]
<FromGitter> <straight-shoota> *Naive* better than *Simple* https://gist.github.com/straight-shoota/219eb51e741bb9c57849683ae623dd36
<oz> @straight-shoota is that the "optimized" go code? The author states that it runs in 0.338s 🤔
<FromGitter> <straight-shoota> The absolute running time depends on the system... I'd say that measurement seems quite reasonable for a fast machine. But Crystal would probably be faster :D
<RX14> @straight-shoota please include the actual benchmark results in that gist
<oz> @straight-shoota in my very short experience, Crystal is very fast. :)
<RX14> @straight-shoota try gccgo
<RX14> i'm reasonably sure crystal would get rekt
<RX14> actually maybe not idk
<FromGitter> <watzon> The GitHub unicorn is back 😢
<RX14> its not all the time for me
<RX14> it got it once
<RX14> seems to be OK now
<FromGitter> <watzon> https://twitter.com/githubstatus
<RX14> it seems to be intremittent
<FromGitter> <watzon> Yeah it is, I can get through every now and then
<FromGitter> <straight-shoota> @RX14 here are the results with cached stream: ⏎ ⏎ ```code paste, see link``` [https://gitter.im/crystal-lang/crystal?at=597f5bc61c8697534a76d627]
<RX14> wow thats slow
<RX14> my PC runs them at like 4x the speed
<RX14> would be great if you updated the gist @straight-shoota
<FromGitter> <straight-shoota> I am on Ubuntu on Windows and my laptop is already a few years old
<FromGitter> <straight-shoota> Although it might help to read the file from the SSD :D
<FromGitter> <straight-shoota> I will
<RX14> if you update the gist maybe I can get some more accurate numbers
<FromGitter> <watzon> They've upgraded it to major
<FromGitter> <straight-shoota> @RX14 updated
<RX14> cool
<RX14> on my PC the cached stream makes essentially 0 difference
rohitpaulk has quit [Ping timeout: 260 seconds]
<RX14> @straight-shoota straight-shoota
<RX14> oops
<FromGitter> <jsilverMDX> does anyone know how I can remove by _id with mongo.cr ???
<FromGitter> <straight-shoota> Great 👍
<FromGitter> <straight-shoota> Yeah I have sometimes high variations between individual runs and 0% derivation for most readings. It looks like benchmark.ips does not do multiple runs when the first one takes longer than about 4.X seconds or so
<FromGitter> <straight-shoota> Ah no I misunderstood the `calculations` and `warmup` arguments :/ Its seconds not iterations
<FromGitter> <straight-shoota> so of course with a default value of 5 seconds we're not getting far
DTZUZU has quit [Quit: WeeChat 1.9]
<FromGitter> <straight-shoota> for reliable results you need to increase `calculations`
DTZUZU has joined #crystal-lang
<RX14> @straight-shoota well ips is really meant for small microbenchmarks
<FromGitter> <straight-shoota> yeah
<FromGitter> <straight-shoota> but the output is also nice for longer benchmarks^^
<RX14> yup
<RX14> ideally it does both
<FromGitter> <watzon> Any help here would be greatl appreciated #4767
<FromGitter> <watzon> I can't get the compiler specs to pass on Manjaro linux
_tsound has joined #crystal-lang
rohitpaulk has joined #crystal-lang
rohitpaulk has quit [Ping timeout: 240 seconds]
Split has joined #crystal-lang
Split_ has joined #crystal-lang
rohitpaulk has joined #crystal-lang
Split__ has joined #crystal-lang
Split has quit [Ping timeout: 260 seconds]
Split_ has quit [Ping timeout: 260 seconds]
Split__ has quit [Ping timeout: 240 seconds]
rohitpaulk has quit [Ping timeout: 246 seconds]
rohitpaulk has joined #crystal-lang
<_tsound> quick question, does it matter the order in which you call functions matter?
<FromGitter> <straight-shoota> in what context?
<_tsound> like if one function calls another function thats below it?
<FromGitter> <bew> _tsound, it doesn't matter, you can define a method anywhere
<_tsound> thanks
rohitpaulk has quit [Ping timeout: 240 seconds]
<FromGitter> <straight-shoota> @RX14 I updated the gist again and added among others a comparison with the Go implementation
rohitpaulk has joined #crystal-lang
<FromGitter> <straight-shoota> I didn't get gccgo to produce a working binary
<w-p> is there any guidance out there on profiling a crystal app?
<w-p> i've been messing with HTTP::Server and in my very naive testing wrk is producing about 20k - 30k req/sec.
<w-p> with pypy and falcon, things 'seem' quite a bit faster so I want see what i'm doing wrong.
alibby has quit [Quit: Leaving.]
<FromGitter> <straight-shoota> @RX14 now also with nuts mode, which loads all data into memory
<FromGitter> <straight-shoota> cuts time in half on my system
alibby has joined #crystal-lang
rohitpaulk has quit [Ping timeout: 260 seconds]
<Yxhuvud> while interesting to see how much you can optimize it, is it really worth bothering to implement optimizations that could be done to the go variant as well?
<FromGitter> <konovod> Crystal version is 2.9s (both with and without array) vs 2.1s with D (ldc) version on my machine. Still not bad.
Split has joined #crystal-lang
Split_ has joined #crystal-lang
Split__ has joined #crystal-lang
Split has quit [Ping timeout: 260 seconds]
Split_ has quit [Ping timeout: 260 seconds]
alibby has quit [Quit: Leaving.]
Split_ has joined #crystal-lang
<travis-ci> crystal-lang/crystal#e2a1389 (release/0.23 - Fix #4639: Macro lookup from included module broken): The build passed. https://travis-ci.org/crystal-lang/crystal/builds/259486861
Split__ has quit [Ping timeout: 260 seconds]
Split_ has quit [Ping timeout: 240 seconds]
<travis-ci> crystal-lang/crystal#e2a1389 (release/0.23 - Fix #4639: Macro lookup from included module broken): The build passed. https://travis-ci.org/crystal-lang/crystal/builds/259486861
alibby has joined #crystal-lang
rohitpaulk has joined #crystal-lang
<FromGitter> <straight-shoota> @yxhuvud the nuts mode is actually taken from the go implementation, I was just trying to verify if the 0.338s stated for the Go version are possible in Crystal as well.
<FromGitter> <straight-shoota> but the idea to use an array instead of a hashmap could be ported to Go as well
tzekid has quit [Remote host closed the connection]
rohitpaulk has quit [Ping timeout: 240 seconds]
_tsound has quit [Ping timeout: 260 seconds]
<FromGitter> <jsilverMDX> how do I sanitize Zalgo with Crysta;?
<FromGitter> <jsilverMDX> Crystal
Split has joined #crystal-lang
<oprypin> get a blacklist of characters ¯\_(ツ)_/¯
<FromGitter> <straight-shoota> What the heck does the compiler complain about when it tells me `unexpected token: NEWLINE` and points after an `end`? 😄
<FromGitter> <straight-shoota> I'd like to tell him to expect the unexpected...
<adam12> LOL
<adam12> @straight-shoota can you show some code?
<FromGitter> <straight-shoota> I don't know if it's easily to condense... I'm deep into some macro-fu
<crystal-gh> [crystal] RX14 opened pull request #4768: Rescue IO errors from input.close in HTTP request processor (master...bugfix/request-processor-errno) https://git.io/v7Blb
<FromGitter> <straight-shoota> Oh, actually, it is: https://carc.in/#/r/2ggr
https_GK1wmSU has joined #crystal-lang
https_GK1wmSU has left #crystal-lang [#crystal-lang]
<FromGitter> <straight-shoota> even simpler... https://carc.in/#/r/2gh1
<FromGitter> <jwoertink> @straight-shoota I saw your comment on my messed up PR lol. (I probably shouldn't be using git while taking percocet)
<FromGitter> <jwoertink> anyway, from your idea on how to fix that, are you suggesting that I just close that PR, and open a new one with the fixed commits?
<FromGitter> <jwoertink> If I create a new branch, cherry pick some commits, then force push, can I just override that branch?
<FromGitter> <straight-shoota> no, you can keep the pr. just sort out the commit history locally and then force push to the PR branch
<FromGitter> <straight-shoota> this will remove the current commits from the PR and update to the once you're going to push
<FromGitter> <jwoertink> ok, so I checkout master, pull from upstream, checkout a new branch, cherry pick from old branch, then force push to old branch?
<FromGitter> <straight-shoota> yep
<FromGitter> <jwoertink> 👍 here it goes!
<FromGitter> <straight-shoota> or you could directly checkout origin/master into a new branch
<FromGitter> <straight-shoota> `git checkout -b new_branch origin/master`
<FromGitter> <jwoertink> hmm.. that push didn't work. It says everything up-to-date
<FromGitter> <jwoertink> ```code paste, see link``` [https://gitter.im/crystal-lang/crystal?at=597fc372614889d47509103e]
<FromGitter> <straight-shoota> what does `git log` say?
<FromGitter> <jwoertink> it has all the commits
<FromGitter> <jwoertink> my 2 cherry picked commits at the top, then all the master branch commits after
<FromGitter> <jwoertink> maybe I need to make some commit on top of this to push something