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

gitPullOrClone: git restore / reset local repo to avoid pull failures #2869

Closed
iasdeoupxe opened this issue Oct 13, 2019 · 2 comments
Closed

Comments

@iasdeoupxe
Copy link

Inspired by #2860 (comment) and the issue shown below gitPullOrClone could do a git checkout -- * (or similar) to avoid that a possible modification of local files (e.g. caused by the build scripts of the installed project) is causing an error during the installation.

= = = = = = = = = = = = = = = = = = = = =
Installing dependencies for 'powerblock' : PowerBlock Driver
= = = = = = = = = = = = = = = = = = = = =

/home/pi/RetroPie-Setup/tmp/build/powerblock /home/pi

= = = = = = = = = = = = = = = = = = = = =
Getting sources for 'powerblock' : PowerBlock Driver
= = = = = = = = = = = = = = = = = = = = =

Already on 'master'
M       doc/htmlDoc/html/doxygen.css
M       doc/htmlDoc/html/index.html
M       doc/htmlDoc/html/jquery.js
M       doc/htmlDoc/html/search/search.css
M       doc/htmlDoc/html/search/search.js
M       doc/htmlDoc/html/tabs.css
M       doc/htmlDoc/latex/doxygen.sty
M       doc/htmlDoc/latex/refman.tex
Your branch is up-to-date with 'origin/master'.
From https://github.com/petrockblog/PowerBlock
   30485df..a7db2cb  master        -> origin/master
 * [new tag]         release/1.5.0 -> release/1.5.0
 * [new tag]         release/2.0.0 -> release/2.0.0
 * [new tag]         release/1.6.0 -> release/1.6.0
 * [new tag]         release/1.6.1 -> release/1.6.1
 * [new tag]         release/1.6.2 -> release/1.6.2
 * [new tag]         release/1.6.3 -> release/1.6.3
error: Your local changes to the following files would be overwritten by merge:
        doc/htmlDoc/html/doxygen.css
        doc/htmlDoc/html/index.html
        doc/htmlDoc/html/jquery.js
        doc/htmlDoc/html/search/search.css
        doc/htmlDoc/html/search/search.js
        doc/htmlDoc/html/tabs.css
        doc/htmlDoc/latex/doxygen.sty
        doc/htmlDoc/latex/refman.tex
Please commit your changes or stash them before you merge.
Aborting
Updating 30485df..a7db2cb
HEAD is now in branch 'master' at commit '30485dfe9e0341a442ffdc1efa9048c2fcbfccd0'
/home/pi
Error running 'git pull' - returned 1
@joolswills
Copy link
Member

This case should be fixed just for this module I think (can continue discussion on the other issue). I don't want a module wide change.

@iasdeoupxe
Copy link
Author

Haven't thought about this and it indeed makes sense. The building of a module probably should never touch files in a repository on its own and do that only in a not-checked in build directory, everything else sounds to me like a bug in the build scripts of the module itself.

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