Martin L Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/68650 )
Change subject: scripts/update_submodules: Fix "bad revision" error ......................................................................
scripts/update_submodules: Fix "bad revision" error
Fix "bad revision" error when we run "update_submodules" with no option. This adds "origin/trunk" branch name for "util/goswid".
Change-Id: Ie84d40fa00c6d0032b93917ad96e60120388eab5 Signed-off-by: Elyes Haouas ehaouas@noos.fr Reviewed-on: https://review.coreboot.org/c/coreboot/+/68650 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Martin L Roth gaumless@gmail.com --- M util/scripts/update_submodules 1 file changed, 20 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Martin L Roth: Looks good to me, approved Angel Pons: Looks good to me, but someone else must approve
diff --git a/util/scripts/update_submodules b/util/scripts/update_submodules index 6b8eb09..4ca2925 100755 --- a/util/scripts/update_submodules +++ b/util/scripts/update_submodules @@ -110,8 +110,10 @@
if git branch -a | grep -q "origin/main"; then branch_name="origin/main" - else + elif git branch -a | grep -q "origin/master"; then branch_name="origin/master" + elif git branch -a | grep -q "origin/trunk"; then + branch_name="origin/trunk" fi
updated_commit_id="$(git log --pretty='%h' -n 1 "${branch_name}" -- )"