<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<div class="moz-cite-prefix">Doing…<br>
<blockquote><tt>git pull</tt><br>
<tt>git reset --hard 812f959cec635cb7a849085bcc46711bd57ff0c9 </tt><br>
<tt>git submodule update</tt><br>
</blockquote>
…should be correct, but creating a fresh clone is of course also
an option.<br>
<br>
These directories:<br>
<blockquote type="cite"> warning: unable to rmdir
'components/asio/asio': Directory not empty
<br>
warning: unable to rmdir 'components/expat/expat': Directory
not empty
</blockquote>
…can be removed.<br>
<br>
Regards,<br>
Michael<br>
<br>
<br>
Am 23.08.2018 um 07:45 schrieb Craig Leres:<br>
</div>
<blockquote type="cite"
cite="mid:51b3b653-972a-9d6c-c454-1adee406ae72@xse.com">
<br>
On 8/22/18 8:49 AM, Michael Balzer wrote:
<br>
<blockquote type="cite">OK, our esp-idf repository is now rolled
back to the previous commit.
<br>
<br>
After pulling you may need to explicitly "git checkout master"
-- verify you're on commit
812f959cec635cb7a849085bcc46711bd57ff0c9.
<br>
<br>
You also will need to do a "git submodule update" afterwards.
<br>
</blockquote>
<br>
Hum... My "update.sh" script says:
<br>
<br>
#!/bin/sh
<br>
set -x
<br>
git pull
<br>
git submodule update
<br>
<br>
when I run it I'm, "Already up to date."
<br>
<br>
If I do "git checkout master" it says:
<br>
<br>
Already on 'master'
<br>
Your branch is ahead of 'origin/master' by 378 commits.
<br>
(use "git push" to publish your local commits)
<br>
<br>
google tells me the way to show my current git hash is:
<br>
<br>
ice 472 % git rev-parse HEAD
<br>
88e6723d487fe91bae5c09f7534d5b78e327dbad
<br>
<br>
which doesn't match. google gave me a way to go to a specific
hash:
<br>
<br>
ice 473 % git reset --hard
812f959cec635cb7a849085bcc46711bd57ff0c9
<br>
warning: unable to rmdir 'components/asio/asio': Directory not
empty
<br>
warning: unable to rmdir 'components/expat/expat': Directory
not empty
<br>
HEAD is now at 812f959c Merge pull request #1 from
leres/master
<br>
ice 474 % rm -rf components/asio/asio components/expat/expat
<br>
ice 475 % git reset --hard
812f959cec635cb7a849085bcc46711bd57ff0c9
<br>
HEAD is now at 812f959c Merge pull request #1 from
leres/master
<br>
<br>
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.
<br>
<br>
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?
<br>
<br>
Craig
<br>
_______________________________________________
<br>
OvmsDev mailing list
<br>
<a class="moz-txt-link-abbreviated" href="mailto:OvmsDev@lists.openvehicles.com">OvmsDev@lists.openvehicles.com</a>
<br>
<a class="moz-txt-link-freetext" href="http://lists.openvehicles.com/mailman/listinfo/ovmsdev">http://lists.openvehicles.com/mailman/listinfo/ovmsdev</a>
<br>
</blockquote>
<br>
<br>
<pre class="moz-signature" cols="144">--
Michael Balzer * Helkenberger Weg 9 * D-58256 Ennepetal
Fon 02333 / 833 5735 * Handy 0176 / 206 989 26
</pre>
</body>
</html>