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.

Sign up for GitHub

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

Jump to bottom

Should treat *.png as binary in .gitattributes #27486

Closed
shanyu opened this issue Oct 20, 2018 · 5 comments
Closed

Should treat *.png as binary in .gitattributes #27486

shanyu opened this issue Oct 20, 2018 · 5 comments

Comments

@shanyu
Copy link

shanyu commented Oct 20, 2018

On Ubuntu 16.04, Apache tez 0.9.1 build failed with bower install:

bower bootstrap#3.3.6 ECMDERR Failed to execute "git checkout 81df608", exit code of #1 error: Your local changes to the following files would be overwritten by checkout: site/docs/4.1/assets/brand/bootstrap-social-logo.png site/docs/4.1/assets/brand/bootstrap-social.png site/docs/4.1/assets/img/bootstrap-stack.png site/docs/4.1/assets/img/bootstrap-themes.png site/docs/4.1/assets/img/favicons/android-chrome-192x192.png site/docs/4.1/assets/img/favicons/android-chrome-512x512.png site/docs/4.1/assets/img/favicons/apple-touch-icon.png site/docs/4.1/assets/img/favicons/favicon-16x16.png site/docs/4.1/assets/img/favicons/favicon-32x32.png site/docs/4.1/assets/img/favicons/mstile-144x144.png site/docs/4.1/assets/img/favicons/mstile-150x150.png site/docs/4.1/assets/img/favicons/mstile-310x150.png site/docs/4.1/assets/img/favicons/mstile-310x310.png site/docs/4.1/assets/img/favicons/mstile-70x70.png site/docs/4.1/examples/screenshots/album.png site/docs/4.1/examples/screenshots/blog.png site/docs/4.1/examples/screenshots/carousel.png site/docs/4.1/examples/screenshots/checkout.png site/docs/4.1/examples/screenshots/cover.png site/docs/4.1/examples/screenshots/dashboard.png site/docs/4.1/examples/screenshots/floating-labels.png site/docs/4.1/examples/screenshots/grid.png site/docs/4.1/examples/screenshots/jumbotron.png site/docs/4.1/examples/screenshots/navbar-bottom.png site/docs/4.1/examples/screenshots/navbar-fixed.png site/docs/4.1/examples/screenshots/navbar-static.png site/docs/4.1/examples/screenshots/navbars.png site/docs/4.1/examples/screenshots/offcanvas.png site/docs/4.1/examples/screenshots/pricing.png site/docs/4.1/examples/screenshots/product.png site/docs/4.1/examples/screenshots/sign-in.png site/docs/4.1/examples/screenshots/starter-template.png site/docs/4.1/examples/screenshots/sticky-footer-navbar.png site/docs/4.1/examples/screenshots/sticky-footer.png Please, commit your changes or stash them before you can switch branches. Aborting
2018-10-19T22:36:16.7019716Z [ERROR]
2018-10-19T22:36:16.7035820Z [ERROR] Additional error details:
2018-10-19T22:36:16.7053108Z [ERROR] error: Your local changes to the following files would be overwritten by checkout:
2018-10-19T22:36:16.7069781Z [ERROR] site/docs/4.1/assets/brand/bootstrap-social-logo.png
2018-10-19T22:36:16.7086962Z [ERROR] site/docs/4.1/assets/brand/bootstrap-social.png
2018-10-19T22:36:16.7104337Z [ERROR] site/docs/4.1/assets/img/bootstrap-stack.png
2018-10-19T22:36:16.7123835Z [ERROR] site/docs/4.1/assets/img/bootstrap-themes.png
2018-10-19T22:36:16.7141095Z [ERROR] site/docs/4.1/assets/img/favicons/android-chrome-192x192.png
2018-10-19T22:36:16.7158276Z [ERROR] site/docs/4.1/assets/img/favicons/android-chrome-512x512.png
2018-10-19T22:36:16.7175348Z [ERROR] site/docs/4.1/assets/img/favicons/apple-touch-icon.png
2018-10-19T22:36:16.7192361Z [ERROR] site/docs/4.1/assets/img/favicons/favicon-16x16.png
2018-10-19T22:36:16.7209887Z [ERROR] site/docs/4.1/assets/img/favicons/favicon-32x32.png
2018-10-19T22:36:16.7226901Z [ERROR] site/docs/4.1/assets/img/favicons/mstile-144x144.png
2018-10-19T22:36:16.7243979Z [ERROR] site/docs/4.1/assets/img/favicons/mstile-150x150.png
2018-10-19T22:36:16.7261018Z [ERROR] site/docs/4.1/assets/img/favicons/mstile-310x150.png
2018-10-19T22:36:16.7281206Z [ERROR] site/docs/4.1/assets/img/favicons/mstile-310x310.png
2018-10-19T22:36:16.7298762Z [ERROR] site/docs/4.1/assets/img/favicons/mstile-70x70.png
2018-10-19T22:36:16.7315247Z [ERROR] site/docs/4.1/examples/screenshots/album.png
2018-10-19T22:36:16.7331926Z [ERROR] site/docs/4.1/examples/screenshots/blog.png
2018-10-19T22:36:16.7348023Z [ERROR] site/docs/4.1/examples/screenshots/carousel.png
2018-10-19T22:36:16.7364203Z [ERROR] site/docs/4.1/examples/screenshots/checkout.png
2018-10-19T22:36:16.7380357Z [ERROR] site/docs/4.1/examples/screenshots/cover.png
2018-10-19T22:36:16.7396449Z [ERROR] site/docs/4.1/examples/screenshots/dashboard.png
2018-10-19T22:36:16.7413625Z [ERROR] site/docs/4.1/examples/screenshots/floating-labels.png
2018-10-19T22:36:16.7435371Z [ERROR] site/docs/4.1/examples/screenshots/grid.png
2018-10-19T22:36:16.7454102Z [ERROR] site/docs/4.1/examples/screenshots/jumbotron.png
2018-10-19T22:36:16.7471675Z [ERROR] site/docs/4.1/examples/screenshots/navbar-bottom.png
2018-10-19T22:36:16.7489618Z [ERROR] site/docs/4.1/examples/screenshots/navbar-fixed.png
2018-10-19T22:36:16.7506558Z [ERROR] site/docs/4.1/examples/screenshots/navbar-static.png
2018-10-19T22:36:16.7523151Z [ERROR] site/docs/4.1/examples/screenshots/navbars.png
2018-10-19T22:36:16.7539424Z [ERROR] site/docs/4.1/examples/screenshots/offcanvas.png
2018-10-19T22:36:16.7555521Z [ERROR] site/docs/4.1/examples/screenshots/pricing.png
2018-10-19T22:36:16.7571675Z [ERROR] site/docs/4.1/examples/screenshots/product.png
2018-10-19T22:36:16.7590231Z [ERROR] site/docs/4.1/examples/screenshots/sign-in.png
2018-10-19T22:36:16.7607304Z [ERROR] site/docs/4.1/examples/screenshots/starter-template.png
2018-10-19T22:36:16.7624450Z [ERROR] site/docs/4.1/examples/screenshots/sticky-footer-navbar.png
2018-10-19T22:36:16.7642654Z [ERROR] site/docs/4.1/examples/screenshots/sticky-footer.png
2018-10-19T22:36:16.7659607Z [ERROR] Please, commit your changes or stash them before you can switch branches.
2018-10-19T22:36:16.7675651Z [ERROR] Aborting

This is because this repo does not treat *.png as binary.

Solution:
Add this line to .gitattributes:
*.png binary
@shanyu
Copy link
Author

shanyu commented Oct 20, 2018

To repro this problem, very easy:
git clone https://github.com/twbs/bootstrap.git
cd bootstrap
git checkout 81df608

@XhmikosR
Copy link
Member

Yeah, time to update your git client.

@XhmikosR
Copy link
Member

I decided to revert the .gitattributes change. Unfortunately Ubuntu is using a pretty ancient git client. So for now I guess it's best to revert the change. Still though, you should update your git client for your own good. :)

@XhmikosR XhmikosR mentioned this issue Oct 21, 2018
Merged
@shanyu
Copy link
Author

shanyu commented Oct 23, 2018

Thanks @XhmikosR for the patch and it fixed our tez build. It was not so simple to upgrade git version. The tez project failed to build because it uses bower to install this repo and I'm not sure what version of git the bower tool uses.

@XhmikosR
Copy link
Member

XhmikosR commented Oct 23, 2018 •
edited
Loading

You shouldn't use Bower either...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@XhmikosR @shanyu