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.

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

Rebase from linguist again #2

Closed
mdespuits opened this issue Apr 6, 2013 · 3 comments
Closed

Rebase from linguist again #2

mdespuits opened this issue Apr 6, 2013 · 3 comments

Comments

@mdespuits
Copy link

Any chance you could update from linguist again? There are some new features that would be very useful on the project I am working on. Thanks!

@grosser
Copy link
Owner

grosser commented Apr 7, 2013

Took a look, but it's a mess and I also killed binary+vendor so merge/rebase is not really an option.

Most important changes are here:
09e1c96

I think the safes/best way would be to checkout linguist master, reapply the changes and the force-push

  • instead of deleting sections -> =begin section =end -> no conflicts when merging
  • keep vendor/binary logic (not sure why I removed binary but I think it needed some kind of other dependency)

@mdespuits
Copy link
Author

Yeah, I made a quick attempt, but as I am not familiar with this gem's internals at all yet, I just gave up for now. Technically, we're not doing any computation against the methods I mentioned like binary? and image?, so I may be able to avoid that. Yes, it did require charlock_holmes, which we are trying to eliminate as it is not only another gem dependency, but it also has a system level dependency...

For now, I will just see about avoiding that mess. If not, I'll refer back here.

@mdespuits
Copy link
Author

We were able to switch successfully. I'll come back here again if we need to get support for binary file detection. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants