git reset --hard after removing the modules

If src/gmock is removed after git reset --hard, it won't be populated if
it is a directory. It will only be populated if it is a submodule
because git submodule update --init follows.

Signed-off-by: Loic Dachary <loic@dachary.org>

diff --git a/build-ceph-deb-native.sh b/build-ceph-deb-native.sh
index 2f74407ff3e55bb5afee6d73ccf9ddd031561ba5..6db619f3eb06d13527df9daecef1e2d1cb443641 100755 (executable)
--- a/build-ceph-deb-native.sh
+++ b/build-ceph-deb-native.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -x
 set -e
 
-git clean -fdx && git reset --hard
 git submodule foreach 'git clean -fdx && git reset --hard'
 rm -rf ceph-object-corpus
 rm -rf ceph-erasure-code-corpus
@@ -14,6 +13,7 @@ rm -rf src/rocksdb
 rm -rf src/erasure-code/jerasure/gf-complete
 rm -rf src/erasure-code/jerasure/jerasure
 rm -rf .git/modules/
+git clean -fdx && git reset --hard
 /srv/git/bin/git submodule sync
 /srv/autobuild-ceph/use-mirror.sh
 /srv/git/bin/git submodule update --init

diff --git a/build-ceph-deb.sh b/build-ceph-deb.sh
index 4d3b7f81e6da74f828c9b6bfb10c418e45451088..1ee3a07ba2f1b6651e7e2f0f32c370e96b2c054b 100755 (executable)
--- a/build-ceph-deb.sh
+++ b/build-ceph-deb.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -x
 set -e
 
-git clean -fdx && git reset --hard
 git submodule foreach 'git clean -fdx && git reset --hard'
 rm -rf ceph-object-corpus
 rm -rf ceph-erasure-code-corpus
@@ -14,6 +13,7 @@ rm -rf src/rocksdb
 rm -rf src/erasure-code/jerasure/gf-complete
 rm -rf src/erasure-code/jerasure/jerasure
 rm -rf .git/modules/
+git clean -fdx && git reset --hard
 /srv/git/bin/git submodule sync
 /srv/autobuild-ceph/use-mirror.sh
 /srv/git/bin/git submodule update --init

diff --git a/build-ceph-gcov.sh b/build-ceph-gcov.sh
index bfad54111106f63181d1262301462d2259cd9bc3..596c8a062613f0760939e974de57fbb740f88a9f 100755 (executable)
--- a/build-ceph-gcov.sh
+++ b/build-ceph-gcov.sh
@@ -2,7 +2,6 @@
 set -e
 
 
-git clean -fdx && git reset --hard
 git submodule foreach 'git clean -fdx && git reset --hard'
 rm -rf ceph-object-corpus
 rm -rf ceph-erasure-code-corpus
@@ -15,6 +14,7 @@ rm -rf src/rocksdb
 rm -rf src/erasure-code/jerasure/gf-complete
 rm -rf src/erasure-code/jerasure/jerasure
 rm -rf .git/modules/
+git clean -fdx && git reset --hard
 /srv/git/bin/git submodule sync
 /srv/autobuild-ceph/use-mirror.sh
 /srv/git/bin/git submodule update --init

diff --git a/build-ceph-notcmalloc.sh b/build-ceph-notcmalloc.sh
index 56909bd3c038b30040a5f52805fb07b2f572aef3..08762dc0cc1ae6f232ce6e5b447f2972f416fa2d 100755 (executable)
--- a/build-ceph-notcmalloc.sh
+++ b/build-ceph-notcmalloc.sh
@@ -2,7 +2,6 @@
 set -e
 
 
-git clean -fdx && git reset --hard
 git submodule foreach 'git clean -fdx && git reset --hard'
 rm -rf ceph-object-corpus
 rm -rf ceph-erasure-code-corpus
@@ -15,6 +14,7 @@ rm -rf src/rocksdb
 rm -rf src/erasure-code/jerasure/gf-complete
 rm -rf src/erasure-code/jerasure/jerasure
 rm -rf .git/modules/
+git clean -fdx && git reset --hard
 /srv/git/bin/git submodule sync
 /srv/autobuild-ceph/use-mirror.sh
 /srv/git/bin/git submodule update --init

diff --git a/build-ceph-rpm.sh b/build-ceph-rpm.sh
index 5e67e27ff8f3273c54fc610e35a8565d1e3649cc..9475aae7e60e347297e4857026d7fac3e40c3836 100755 (executable)
--- a/build-ceph-rpm.sh
+++ b/build-ceph-rpm.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -x
 set -e
 
-git clean -fdx && git reset --hard
 git submodule foreach 'git clean -fdx && git reset --hard'
 rm -rf ceph-object-corpus
 rm -rf ceph-erasure-code-corpus
@@ -14,6 +13,7 @@ rm -rf src/rocksdb
 rm -rf src/erasure-code/jerasure/gf-complete
 rm -rf src/erasure-code/jerasure/jerasure
 rm -rf .git/modules/
+git clean -fdx && git reset --hard
 /srv/git/bin/git submodule sync
 /srv/autobuild-ceph/use-mirror.sh
 /srv/git/bin/git submodule update --init

diff --git a/build-ceph.sh b/build-ceph.sh
index d6bd7fc3103a34ac9963401ceba597bb930aae38..2758ab483ea743fccd59da9b3d1f30dd1a5b6943 100755 (executable)
--- a/build-ceph.sh
+++ b/build-ceph.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -x
 set -e
 
-git clean -fdx && git reset --hard
 git submodule foreach 'git clean -fdx && git reset --hard'
 rm -rf ceph-object-corpus
 rm -rf ceph-erasure-code-corpus
@@ -14,6 +13,7 @@ rm -rf src/rocksdb
 rm -rf src/erasure-code/jerasure/gf-complete
 rm -rf src/erasure-code/jerasure/jerasure
 rm -rf .git/modules/
+git clean -fdx && git reset --hard
 /srv/git/bin/git submodule sync
 /srv/autobuild-ceph/use-mirror.sh
 /srv/git/bin/git submodule update --init