Doing… git pull git reset --hard 812f959cec635cb7a849085bcc46711bd57ff0c9 git submodule update …should be correct, but creating a fresh clone is of course also an option. These directories:
warning: unable to rmdir 'components/asio/asio': Directory not empty warning: unable to rmdir 'components/expat/expat': Directory not empty …can be removed.
Regards, Michael Am 23.08.2018 um 07:45 schrieb Craig Leres:
On 8/22/18 8:49 AM, Michael Balzer wrote:
OK, our esp-idf repository is now rolled back to the previous commit.
After pulling you may need to explicitly "git checkout master" -- verify you're on commit 812f959cec635cb7a849085bcc46711bd57ff0c9.
You also will need to do a "git submodule update" afterwards.
Hum... My "update.sh" script says:
#!/bin/sh set -x git pull git submodule update
when I run it I'm, "Already up to date."
If I do "git checkout master" it says:
Already on 'master' Your branch is ahead of 'origin/master' by 378 commits. (use "git push" to publish your local commits)
google tells me the way to show my current git hash is:
ice 472 % git rev-parse HEAD 88e6723d487fe91bae5c09f7534d5b78e327dbad
which doesn't match. google gave me a way to go to a specific hash:
ice 473 % git reset --hard 812f959cec635cb7a849085bcc46711bd57ff0c9 warning: unable to rmdir 'components/asio/asio': Directory not empty warning: unable to rmdir 'components/expat/expat': Directory not empty HEAD is now at 812f959c Merge pull request #1 from leres/master ice 474 % rm -rf components/asio/asio components/expat/expat ice 475 % git reset --hard 812f959cec635cb7a849085bcc46711bd57ff0c9 HEAD is now at 812f959c Merge pull request #1 from leres/master
I'm embarrassed to admit I'm so lame at git but I haven't been able to wrap my head around it so far. It all seems like arbitry magic as far as I can tell. I started with sccs, did a lot with rcs and went "all in" with subversion 10-15 years ago.
I tried to flash my module but it looks like it already lost its config so I take it "module factory reset" is the best starting point?
Craig _______________________________________________ OvmsDev mailing list OvmsDev@lists.openvehicles.com http://lists.openvehicles.com/mailman/listinfo/ovmsdev
-- Michael Balzer * Helkenberger Weg 9 * D-58256 Ennepetal Fon 02333 / 833 5735 * Handy 0176 / 206 989 26