[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 5/5] build: delay check for empty git submodule l
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v3 5/5] build: delay check for empty git submodule list |
Date: |
Fri, 3 Nov 2017 15:33:33 +0000 |
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"
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"
--
2.13.6
- [Qemu-devel] [PATCH v3 0/5] Various improvements/bugfixes to submodule handling, Daniel P. Berrange, 2017/11/03
- [Qemu-devel] [PATCH v3 1/5] build: allow setting a custom GIT binary for transparent proxying, Daniel P. Berrange, 2017/11/03
- [Qemu-devel] [PATCH v3 2/5] build: don't create temporary files in source dir, Daniel P. Berrange, 2017/11/03
- [Qemu-devel] [PATCH v3 3/5] build: allow automatic git submodule updates to be disabled, Daniel P. Berrange, 2017/11/03
- [Qemu-devel] [PATCH v3 5/5] build: delay check for empty git submodule list,
Daniel P. Berrange <=
- Re: [Qemu-devel] [PATCH v3 5/5] build: delay check for empty git submodule list, Eric Blake, 2017/11/03
- Re: [Qemu-devel] [PATCH v3 5/5] build: delay check for empty git submodule list, Alexey Kardashevskiy, 2017/11/06
- Re: [Qemu-devel] [PATCH v3 5/5] build: delay check for empty git submodule list, Alexey Kardashevskiy, 2017/11/07
- Re: [Qemu-devel] [PATCH v3 5/5] build: delay check for empty git submodule list, Alexey Kardashevskiy, 2017/11/08
- Re: [Qemu-devel] [PATCH v3 5/5] build: delay check for empty git submodule list, Daniel P. Berrange, 2017/11/08
[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