From 16ea843ee3b72cc770d0e44ad7823841527dd319 Mon Sep 17 00:00:00 2001
From: Loic Dachary <ldachary@redhat.com>
Date: Thu, 5 Mar 2015 22:25:46 +0100
Subject: [PATCH] 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>
---
 build-ceph-deb-native.sh | 2 +-
 build-ceph-deb.sh        | 2 +-
 build-ceph-gcov.sh       | 2 +-
 build-ceph-notcmalloc.sh | 2 +-
 build-ceph-rpm.sh        | 2 +-
 build-ceph.sh            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build-ceph-deb-native.sh b/build-ceph-deb-native.sh
index 2f74407..6db619f 100755
--- 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 4d3b7f8..1ee3a07 100755
--- 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 bfad541..596c8a0 100755
--- 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 56909bd..08762dc 100755
--- 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 5e67e27..9475aae 100755
--- 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 d6bd7fc..2758ab4 100755
--- 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
-- 
2.39.5