aboutsummaryrefslogtreecommitdiff
path: root/scripts/git-submodule.sh
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2023-05-30 17:27:48 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2023-06-06 16:30:01 +0200
commitd120116b5d6e81831332f807028a29c5e5815a6a (patch)
tree189aa43f3b684808c14ab6c528a07c6b303bed5c /scripts/git-submodule.sh
parentfdb8fd8cb915647be7f7f2e2f0c530ed06ca9b01 (diff)
build: log submodule update from git-submodule.sh
Print exactly which submodules have been updated, by reusing the logic of "git-submodule.sh validate" after executing "git submodule update --init'. Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'scripts/git-submodule.sh')
-rwxr-xr-xscripts/git-submodule.sh16
1 files changed, 11 insertions, 5 deletions
diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh
index b7d8f05352..38b55c90e1 100755
--- a/scripts/git-submodule.sh
+++ b/scripts/git-submodule.sh
@@ -46,6 +46,13 @@ validate_error() {
exit 1
}
+check_updated() {
+ local CURSTATUS OLDSTATUS
+ CURSTATUS=$($GIT submodule status $module)
+ OLDSTATUS=$(grep $module $substat)
+ test "$CURSTATUS" = "$OLDSTATUS"
+}
+
if test -n "$maybe_modules" && ! test -e ".git"
then
echo "$0: unexpectedly called with submodules but no git checkout exists"
@@ -75,11 +82,7 @@ status|validate)
test -f "$substat" || validate_error "$command"
test -z "$maybe_modules" && exit 0
for module in $modules; do
- CURSTATUS=$($GIT submodule status $module)
- OLDSTATUS=$(cat $substat | grep $module)
- if test "$CURSTATUS" != "$OLDSTATUS"; then
- validate_error "$command"
- fi
+ check_updated $module || validate_error "$command"
done
exit 0
;;
@@ -89,6 +92,9 @@ update)
$GIT submodule update --init $modules 1>/dev/null
test $? -ne 0 && update_error "failed to update modules"
+ for module in $modules; do
+ check_updated $module || echo Updated "$module"
+ done
(while read -r; do
for module in $modules; do