From 8d79811c6a1e32a1619ba360af4d8d8bf99fc2c2 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 22 May 2023 10:20:29 +0800 Subject: [PATCH] scripts/refresh-submodules.sh: use the correct sha1 in title 0d4ffe1d69d70848446129d47570808d618112d7 introduced a regression where it used the sha1 of the local "master" branch instead of the remote's "master" branch in the title of the commit message. in this change, let's use the origin/${branch}'s sha1 in the title. Signed-off-by: Kefu Chai Closes #13974 --- scripts/refresh-submodules.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/refresh-submodules.sh b/scripts/refresh-submodules.sh index 9c96c91917..7acedc811d 100755 --- a/scripts/refresh-submodules.sh +++ b/scripts/refresh-submodules.sh @@ -36,7 +36,7 @@ for ent in "${@:-${submodules[@]}}"; do fi # collect the summary head_ref=$(git rev-parse --short=8 HEAD) - branch_ref=$(git rev-parse --short=8 ${branch}) + branch_ref=$(git rev-parse --short=8 origin/${branch}) count=$(git rev-list --no-merges --count HEAD..${bump_to}) # create a summary using the output format of "git submodule summary" SUMMARY="