[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-640-g990869f7e

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  990869f7ec8dbb91f14f9edde6f02dc30fd18b8e (commit)
      from  6ed058933cfc023ef02e8c6d08c37ddc5b0328c2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 990869f7ec8dbb91f14f9edde6f02dc30fd18b8e
Author: Antonio Borneo <bor...@gm...>
Date:   Fri Jun 21 14:32:45 2024 +0200

    openocd: build: prevent old clone to fail on git submodules
    
    Working on an old local git repository, the git sub-modules could
    have been set before last changes in .gitmodules.
    The script 'bootstrap' does not update the url of the repositories
    and this can cause the script to fail.
    
    Add 'git submodule sync' to the script to update the url of the
    repositories.
    While there, fuse 'git submodule init' and git submodule update'
    in a single command.
    
    Reported-by: Karl Hammar <ka...@as...>
    Change-Id: I61412f804dbbb7a843aa009139ddb4b8e71beefb
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8375
    Tested-by: jenkins

diff --git a/bootstrap b/bootstrap
index cf6167fff..7d4ca37bd 100755
--- a/bootstrap
+++ b/bootstrap
@@ -38,8 +38,8 @@ if [ -n "$SKIP_SUBMODULE" ]; then
     echo "Skipping submodule setup"
 else
     echo "Setting up submodules"
-    git submodule init
-    git submodule update
+    git submodule sync
+    git submodule update --init
 fi
 
 if [ -x src/jtag/drivers/libjaylink/autogen.sh ]; then

-----------------------------------------------------------------------

Summary of changes:
 bootstrap | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository