OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

git-submodule: allow partial update of .git-submodule-status

Browse Source 
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>
This commit is contained in:
Paolo Bonzini 2023-05-30 17:10:29 +02:00
parent ac4ccac740
commit fdb8fd8cb9
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/git-submodule.sh
View File

@ -72,12 +72,8 @@ done
case "$command" in case "$command" in
status|validate) status|validate)
if test -z "$maybe_modules"
then
test -s ${substat} && validate_error "$command" || exit 0
fi
test -f "$substat" || validate_error "$command" test -f "$substat" || validate_error "$command"
test -z "$maybe_modules" && exit 0
for module in $modules; do for module in $modules; do
CURSTATUS=$($GIT submodule status $module) CURSTATUS=$($GIT submodule status $module)
OLDSTATUS=$(cat $substat | grep $module) OLDSTATUS=$(cat $substat | grep $module)
@ -88,17 +84,23 @@ status|validate)
exit 0 exit 0
;; ;;
update) update)
if test -z "$maybe_modules"
then
test -e $substat || touch $substat test -e $substat || touch $substat
exit 0 test -z "$maybe_modules" && exit 0
fi
$GIT submodule update --init $modules 1>/dev/null $GIT submodule update --init $modules 1>/dev/null
test $? -ne 0 && update_error "failed to update modules" test $? -ne 0 && update_error "failed to update modules"
$GIT submodule status $modules > "${substat}" (while read -r; do
test $? -ne 0 && update_error "failed to save git submodule status" >&2 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 esac