From 479401ee9dcb95df8026fe127faa1c1ce71d0e29 Mon Sep 17 00:00:00 2001
From: Shankari <k.shankari@ee.doe.gov>
Date: Fri, 31 May 2024 17:13:28 -0700
Subject: [PATCH] reset to the known good commit *after* cloning

This should fix
https://github.com/EVerest/everest-demo/issues/47#issuecomment-2143117112

Testing done:

Made a change to copy the everest demo instead of cloning it.

```
$ bash demo-iso15118-2-ac-plus-ocpp.sh -r /.../everest-demo -3
/var/folders/y5/cx3cfzrd2q116myv9ly86sw1rnlmdj/T/tmp.4wcbFf1P/maeve-csms /var/folders/y5/cx3cfzrd2q116myv9ly86sw1rnlmdj/T/tmp.4wcbFf1P
HEAD is now at b990d0e fix: make lb depend on services in compose
...
Patching the CSMS to enable EVerest organization
patching file docker-compose.yml
Patching the CSMS to enable local mo root
patching file 'config/manager/config.toml'
Patching the CSMS to enable local mo root
patching file 'manager/handlers/ocpp201/authorize.go'
Starting the CSMS
```
---
 demo-iso15118-2-ac-plus-ocpp.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/demo-iso15118-2-ac-plus-ocpp.sh b/demo-iso15118-2-ac-plus-ocpp.sh
index d704df32..37044d78 100755
--- a/demo-iso15118-2-ac-plus-ocpp.sh
+++ b/demo-iso15118-2-ac-plus-ocpp.sh
@@ -91,14 +91,14 @@ cd "${DEMO_DIR}" || exit 1
 echo "Cloning EVerest from ${DEMO_REPO} into ${DEMO_DIR}/everest-demo"
 git clone --branch "${DEMO_BRANCH}" "${DEMO_REPO}" everest-demo
 
-git reset --hard ${CSMS_BRANCH}
-
 if [[ "$DEMO_VERSION" != v1.6j ]]; then
   echo "Cloning ${CSMS} CSMS from ${CSMS_REPO} into ${DEMO_DIR}/${CSMS}-csms and starting it"
   git clone ${CSMS_REPO} ${CSMS}-csms
 
   pushd ${CSMS}-csms || exit 1
 
+  git reset --hard ${CSMS_BRANCH}
+
   # Set up CSMS
   echo "Setting up ${CSMS}"
   if [[ "$CSMS" == "citrine" ]]; then