[Ovmsdev] Ready for 3.2.011?

[Michael Balzer]

Adding "--recursive" is recommended, but I think you really need to merge upstream/master before doing the submodule update.

"submodule update" will update the submodules to the state as required by the current repository state. So you first need to update your branch or checkout an
updated one.

Regards,
Michael


Am 04.04.20 um 19:30 schrieb Craig Leres:
> I think this fixes it?
>
>         Craig
>
> ice 139 % rcsdiff -u update.sh
> ===================================================================
> RCS file: RCS/update.sh,v
> retrieving revision 1.1
> diff -u -r1.1 update.sh
> --- update.sh   2020/04/04 17:29:05     1.1
> +++ update.sh   2020/04/04 17:29:11
> @@ -2,6 +2,6 @@
>  set -x
>  git fetch upstream
>  git checkout master
> -git submodule update
> +git submodule update --recursive
>  git merge upstream/master
>  git push

-- 
Michael Balzer * Helkenberger Weg 9 * D-58256 Ennepetal
Fon 02333 / 833 5735 * Handy 0176 / 206 989 26