From: Loic Dachary <ldachary@redhat.com>
Date: Fri, 6 Mar 2015 16:08:55 +0000 (+0100)
Subject: doc,tests: force checkout of submodules
X-Git-Tag: v9.0.0~205^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3a8b8284ddd17ad5c6e27347433cdde6744d0737;p=ceph.git

doc,tests: force checkout of submodules

When updating submodules, always checkout even if the HEAD is the
desired commit hash (update --force) to avoid the following:

* a directory gmock exists in hammer
* a submodule gmock replaces the directory gmock in master
* checkout master + submodule update : gmock/.git is created
* checkout hammer : the gmock directory still contains the .git from
  master because it did not exist at the time and checkout won't
  remove untracked directories
* checkout master + submodule update : git rev-parse HEAD is
  at the desired commit although the content of the gmock directory
  is from hammer

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/autogen.sh b/autogen.sh
index 1e06e2687706..a7cc704a2053 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,7 +29,7 @@ else
 fi
 
 if test -d ".git" ; then
-  if ! git submodule sync || ! git submodule update --init --recursive; then
+  if ! git submodule sync || ! git submodule update --force --init --recursive; then
     echo "Error: could not initialize submodule projects"
     echo "  Network connectivity might be required."
     exit 1
diff --git a/doc/dev/release-process.rst b/doc/dev/release-process.rst
index f039fd875f47..f7e853b1ae47 100644
--- a/doc/dev/release-process.rst
+++ b/doc/dev/release-process.rst
@@ -43,7 +43,7 @@ In the ceph source directory, checkout next branch (for point releases use the {
 
 Checkout the submodules::
 
-    git submodule update --init --recursive
+    git submodule update --force --init --recursive
 
 4.  Update Build version numbers
 ================================
diff --git a/doc/install/clone-source.rst b/doc/install/clone-source.rst
index c7272f252317..fe67857b9a8a 100644
--- a/doc/install/clone-source.rst
+++ b/doc/install/clone-source.rst
@@ -83,7 +83,7 @@ repository.
 
 If your submodules are out of date, run::
 
-	git submodule update --init --recursive
+	git submodule update --force --init --recursive
 
 Choose a Branch
 ===============
diff --git a/src/test/docker-test-helper.sh b/src/test/docker-test-helper.sh
index e7336c083581..3035f0250c34 100755
--- a/src/test/docker-test-helper.sh
+++ b/src/test/docker-test-helper.sh
@@ -96,7 +96,7 @@ function setup_downstream() {
         cd $downstream
         git reset --hard $ref || return 1
         git submodule sync --recursive || return 1
-        git submodule update --init --recursive || return 1
+        git submodule update --force --init --recursive || return 1
     )
 }