[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/21] git-submodule: allow partial update of .git-submodule-statu
From: |
Paolo Bonzini |
Subject: |
[PULL 14/21] git-submodule: allow partial update of .git-submodule-status |
Date: |
Tue, 6 Jun 2023 16:31:09 +0200 |
Allow a specific subdirectory to run git-submodule.sh with only a
subset of submodules, without removing the others from the
.git-submodule-status file.
This also allows scripts/git-submodule.sh to be more lenient:
validating an empty set of submodules is not a mistake.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
scripts/git-submodule.sh | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh
index 0ce1efc44e5..b7d8f05352c 100755
--- a/scripts/git-submodule.sh
+++ b/scripts/git-submodule.sh
@@ -72,12 +72,8 @@ done
case "$command" in
status|validate)
- if test -z "$maybe_modules"
- then
- test -s ${substat} && validate_error "$command" || exit 0
- fi
-
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)
@@ -88,17 +84,23 @@ status|validate)
exit 0
;;
update)
- if test -z "$maybe_modules"
- then
- test -e $substat || touch $substat
- exit 0
- fi
+ test -e $substat || touch $substat
+ test -z "$maybe_modules" && exit 0
$GIT submodule update --init $modules 1>/dev/null
test $? -ne 0 && update_error "failed to update modules"
- $GIT submodule status $modules > "${substat}"
- test $? -ne 0 && update_error "failed to save git submodule status" >&2
+ (while read -r; do
+ for module in $modules; do
+ case $REPLY in
+ *" $module "*) continue 2 ;;
+ esac
+ done
+ printf '%s\n' "$REPLY"
+ done
+ $GIT submodule status $modules
+ test $? -ne 0 && update_error "failed to save git submodule status" >&2) <
$substat > $substat.new
+ mv -f $substat.new $substat
;;
esac
--
2.40.1
- [PULL 04/21] meson.build: Group the UI entries in a separate summary section, (continued)
- [PULL 04/21] meson.build: Group the UI entries in a separate summary section, Paolo Bonzini, 2023/06/06
- [PULL 05/21] meson.build: Group the network backend entries in a separate summary section, Paolo Bonzini, 2023/06/06
- [PULL 06/21] meson.build: Group the audio backend entries in a separate summary section, Paolo Bonzini, 2023/06/06
- [PULL 08/21] scsi/qemu-pr-helper: Drop support for 'old' libmultipath API, Paolo Bonzini, 2023/06/06
- [PULL 07/21] meson.build: Use -Wno-undef only for SDL2 versions that need it, Paolo Bonzini, 2023/06/06
- [PULL 09/21] Revert "tests/requirements.txt: bump up avocado-framework version to 101.0", Paolo Bonzini, 2023/06/06
- [PULL 10/21] tests: Use separate virtual environment for avocado, Paolo Bonzini, 2023/06/06
- [PULL 12/21] configure: remove --with-git= option, Paolo Bonzini, 2023/06/06
- [PULL 13/21] configure: rename --enable-pypi to --enable-download, control subprojects too, Paolo Bonzini, 2023/06/06
- [PULL 11/21] mkvenv: always pass locally-installed packages to pip, Paolo Bonzini, 2023/06/06
- [PULL 14/21] git-submodule: allow partial update of .git-submodule-status,
Paolo Bonzini <=
- [PULL 15/21] build: log submodule update from git-submodule.sh, Paolo Bonzini, 2023/06/06
- [PULL 16/21] meson: subprojects: replace submodules with wrap files, Paolo Bonzini, 2023/06/06
- [PULL 17/21] configure: move SLOF submodule handling to pc-bios/s390-ccw, Paolo Bonzini, 2023/06/06
- [PULL 18/21] pc-bios/s390-ccw: always build network bootloader, Paolo Bonzini, 2023/06/06
- [PULL 21/21] configure: remove --with-git-submodules=, Paolo Bonzini, 2023/06/06
- [PULL 20/21] build: remove git submodule handling from main makefile, Paolo Bonzini, 2023/06/06
- [PULL 19/21] meson: subprojects: replace berkeley-{soft, test}float-3 with wraps, Paolo Bonzini, 2023/06/06
- Re: [PULL 00/21] (Mostly) build system patches for 2023-06-06, Richard Henderson, 2023/06/06