[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 5/5] build: delay check for empty git submodu
From: |
Alexey Kardashevskiy |
Subject: |
Re: [Qemu-devel] [PATCH v3 5/5] build: delay check for empty git submodule list |
Date: |
Tue, 7 Nov 2017 15:12:32 +1100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 |
On 04/11/17 02:33, Daniel P. Berrange wrote:
> We short circuit the git submodule update when passed an empty module list.
> This accidentally causes the 'status' command to write to the status file. The
> test needs to be delayed into the individual commands to avoid this premature
> writing of the status file.
>
> Signed-off-by: Daniel P. Berrange <address@hidden>
> ---
> scripts/git-submodule.sh | 19 ++++++++++++-------
> 1 file changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh
> index 2857fc57c4..90376a7dae 100755
> --- a/scripts/git-submodule.sh
> +++ b/scripts/git-submodule.sh
> @@ -33,12 +33,6 @@ error() {
> exit 1
> }
>
> -if test -z "$maybe_modules"
> -then
> - test -e $substat || touch $substat
> - exit 0
> -fi
> -
> modules=""
> for m in $maybe_modules
> do
> @@ -51,7 +45,7 @@ do
> fi
> done
>
> -if ! test -e ".git"
> +if test -n "$maybe_modules" && ! test -e ".git"
$GIT_DIR should be checked too imho:
if test -n "$maybe_modules" && ! test -e ".git" && test "$GIT_DIR" = ""
> then
> echo "$0: unexpectedly called with submodules but no git checkout exists"
> exit 1
> @@ -59,6 +53,11 @@ fi
>
> case "$command" in
> status)
> + if test -z "$maybe_modules"
> + then
> + test -s ${substat} && exit 1 || exit 0
> + fi
> +
> test -f "$substat" || exit 1
> CURSTATUS=`$GIT submodule status $modules`
> OLDSTATUS=`cat $substat`
> @@ -66,6 +65,12 @@ status)
> exit $?
> ;;
> update)
> + if test -z "$maybe_modules"
> + then
> + test -e $substat || touch $substat
> + exit 0
> + fi
> +
> $GIT submodule update --init $modules 1>/dev/null
> test $? -ne 0 && error "failed to update modules"
>
>
--
Alexey
[Qemu-devel] [PATCH v3 4/5] build: don't fail if given a git submodule which does not exist, Daniel P. Berrange, 2017/11/03
Re: [Qemu-devel] [PATCH v3 0/5] Various improvements/bugfixes to submodule handling, Peter Maydell, 2017/11/03