From 2864100e6b701d9f5b71602245029c79545a0a4c Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Fri, 7 Jun 2024 01:46:38 -0400 Subject: [PATCH] chore: test submodule checkout to branch --- scripts/prepare_test_repos.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/prepare_test_repos.sh b/scripts/prepare_test_repos.sh index 5efa0ae..fc877b4 100755 --- a/scripts/prepare_test_repos.sh +++ b/scripts/prepare_test_repos.sh @@ -9,8 +9,8 @@ mkdir -p $submodules_dir submodules=$(git config --file .gitmodules --get-regexp path | awk '{ print $2 }') for submodule in $submodules; do url=$(git config --file .gitmodules --get-regexp "submodule.$submodule.url" | awk '{ print $2 }') + branch=$(git config --file .gitmodules --get-regexp "submodule.$submodule.branch" | awk '{ print $2 }') repo_name=$(echo $url | rev | cut -d'/' -f 1 | rev | cut -d'.' -f 1) - commit=$(git submodule status $submodule | awk '{ print $1 }' | sed 's/^[+-]//') repo_dir="$tmp_dir/$repo_name" if [[ ! -v repo_names["$repo_name"] ]]; then if [ ! -d "$repo_dir" ]; then @@ -23,7 +23,7 @@ for submodule in $submodules; do fi repo_names[$repo_name]=1 cd $repo_dir - git checkout -q $commit + git checkout -q $branch cd - submodule_dir="$submodules_dir/$repo_name/$submodule" mkdir -p $submodule_dir