Do I need to get the SD card out of the emonPI and do a fresh install?
You shouldnāt need to, but I canāt see how to get git back to the right state. It looks like there has been a local commit (no idea how) but the git diff shows there are no changes!
Can you post the output of this please?
git log -4
Sorry for delay:
Can you check you copied that correctly please. Looks like the top lines are missing.
So this is really strange.
Sorry for this but it does not make much sense! That first commit listed, looks like it has been made locally.
Please try thisā¦
sudo git fetch -f origin
sudo git reset --hard
sudo git clean -ff
Then
sudo checkout -f stable
sudo git pull -f
then
git log -4
and post the output at each stage.
This is really bugging me now 
BTW, sorry about the bad command - glad you worked it out!
The git reset should do just that - reset the repository. Iām doing a fair bit of searching here - you might end up having to start again but Iām not there yet.
Can you try
sudo git reset --hard @{u}
sudo git pull -f
please?
then
sudo git log -4
sudo git reset --hard @{u}
HEAD is now at 76ced7cb Merge remote-tracking branch āorigin/masterā into stable
pi@emonpi:/var/www/emoncms $ sudo git pull -f
Already up-to-date.
pi@emonpi:/var/www/emoncms $ sudo git log -4
commit 76ced7cb65ddce6b748425dd6701399dfee57b5a
Merge: 83eb9ad3 c3783671
Author: TrystanLea [email protected]
Date: Tue Jun 25 14:54:18 2019 +0100
Merge remote-tracking branch 'origin/master' into stable
commit c37836715707f53d478429f5e2d15c1e531e1fb5
Author: TrystanLea [email protected]
Date: Tue Jun 25 14:53:42 2019 +0100
update version
commit 83eb9ad30e3f7a63f973ad603ad7c6f3da4c9d86
Merge: f53bf35b 1bd8ed5e
Author: Trystan Lea [email protected]
Date: Tue Jun 25 14:53:02 2019 +0100
Merge pull request #1328 from emoncms/master
Merge master to stable
commit 1bd8ed5e82486a115149ffeff93f38203644982b
Merge: e0699d9b f53bf35b
Author: TrystanLea [email protected]
Date: Tue Jun 25 14:46:37 2019 +0100
Merge remote-tracking branch 'origin/stable'
indent preformatted text by 4 spaces
Looks like it doesnāt want to pull
That now looks like it should
git describe
should be
10.1.1-2-g76ced7cb
but the real question is, has the error gone?
It is as it should be however the eroor is still there
Ok, try a full update again.
SO, I need to remove SD card and wirite iso with Etcher (the complete OS). WIll it also install the emoncms website code?
No I meant run the update from the admin screen.
Have you set any MQTT inputs/outputs up other than the standard ones?
Iāve did the update but still the same issue
Only standard
Ah so Iām seeing it now so looks like a general problem.
oeps. So I need to wait for an update?
Yes you will.
Will I be inforlmed when?
Thanx for the help
you can revert to the previous version with
git checkout 10.1.0
but you will need to reverse that when the patch is released with
git checkout stable