From 95800bd4170353e069db0dd14cff0eb63f36499f Mon Sep 17 00:00:00 2001 From: dam1n19 <dam1n19@soton.ac.uk> Date: Thu, 4 May 2023 10:09:32 +0100 Subject: [PATCH] Added a git pull to set env script --- set_env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/set_env.sh b/set_env.sh index 102f446..f93060c 100755 --- a/set_env.sh +++ b/set_env.sh @@ -64,7 +64,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/proj-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 }'` && git pull; done git restore $DESIGN_ROOT/.gitmodules touch $PROJECT_DIR/.socinit fi \ No newline at end of file -- GitLab