search

openresty / luajit2

OpenResty's Branch of LuaJIT 2
https://luajit.org/luajit.html
Other
1.24k stars 200 forks source link

Sync with upstream? #84

Closed msva closed 4 years ago

msva commented 4 years ago

It seems, Mike pulled some PRs, and commited some changes in 2.1 branch (well, actually, in 2.0 too) few weeks ago. Wouldn't you pull changes here?

thibaultcha commented 4 years ago

Sure. Please allow for some time.

agentzh commented 4 years ago

Already sync'd in the v2.1-agentzh branch. Sorry for the delay on our side.

exjesper commented 4 years ago

Hi @agentzh, I noticed the sync reverted a bunch of other fixes but couldn't find any ticket explaining why they were reverted. Is it documented somewhere?

agentzh commented 4 years ago

@exjesper Because those bugs were already fixed in (slightly) different ways in the upstream repo. I had to revert them before the merge to minimize merge conflicts.

exjesper commented 4 years ago

OK, make sense. Thanks for the update