From 3d975e434d2f934264b65d58f7db99a1c5b6c1fe Mon Sep 17 00:00:00 2001
From: dam1n19 <dam1n19@soton.ac.uk>
Date: Thu, 27 Apr 2023 16:56:44 +0100
Subject: [PATCH] SOC1-127: Fix project branch file naming issue
---
set_env.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/set_env.sh b/set_env.sh
index d54fb37..ca7d40a 100755
--- a/set_env.sh
+++ b/set_env.sh
@@ -73,7 +73,7 @@ if [ ! -f $PROJECT_DIR/.socinit ]; then
git submodule update --remote --recursive
git submodule foreach --recursive git checkout main
# Read proj-branch file to find out which branch each subrepo needs to be on
- git config --file .gitmodules --get-regexp path | awk '{ print $2 }' | while read line; do cd $PROJECT_DIR/$line && git checkout `grep $line $PROJECT_DIR/project-branch | awk '{ print $2 }'`; done
+ git config --file .gitmodules --get-regexp path | awk '{ print $2 }' | while read line; do cd $PROJECT_DIR/$line && git checkout `grep $line $PROJECT_DIR/proj-branch | awk '{ print $2 }'`; done
git restore $DESIGN_ROOT/.gitmodules
touch $PROJECT_DIR/.socinit
fi
\ No newline at end of file
--
GitLab