retropie error running git pull returned 1

[mitu]

@dunken You modified one of the RetroPie-Setup scripts and the pull asks you to commit/revert your modifications. Run git reset --hard from the RetroPie-Setup script folder and try again.

[dunken]

@mitu Hi

did try that , but ending up with the same error once again .

Any more tip?

pi@retropie:~/RetroPie-Setup $ git reset --hard
HEAD is now at 3928a05 Merge pull request #2217 from joolswills/lr-dosbox

?

[mitu]

@dunken What's the error message you execute git pull from the RetroPie-setup folder ?

[dunken]

@mitu pi@retropie:~/RetroPie-Setup $ git pull
Already up-to-date.

[dudleydes]

@dunken I had a Error running 'git pull' - returned 1 a while ago when updating a fresh 4.2 image.

First thing I did was check the log which you can find in a GZip file in /home/pi/RetroPie-Setup/logs. Here is a copy of my log. It can be seen that the error was due to the Carbon theme so I removed and reinstalled the theme using the setup script. When I next tried to update, everything went smoothly.

[dunken]

@dudleydes

Hi cant really seem to find anything wrong with the log , but perhaps thats me that are missing something

Here is the log pasted

link text

[dudleydes]

@dunken Thanks for the log. The error is in line 1014 and seems to relate to the /opt/retropie/configs/all/retroarch.cfg.rp-distfile. Have you made any changes to this file?

I'm no expert on this but you could try renaming this file to retroarch.cfg.rp-dist.bak and try updating again.

[BuZz]

@dudleydes it's not that. It's probably the shader git repo. They could remove the folder from /opt/retropie/configs/all/retroarch/shaders and reinstall retroarch (or something like that - I'm not in front of pc).

[dunken]

@buzz said in retropie error running git pull returned 1:

/opt/retropie/configs/all/retroarch/shaders

Should i remove /opt/retropie/configs/all/retroarch/shaders

?

And try to upgrade once this folder is gone ?

[BuZz]

@dunken yes.

[dunken]

@buzz

Thnks alot for the great help , the upgrade went ok without any problem