From: Sandon Van Ness <sandon@inktank.com>
Date: Tue, 14 Jan 2014 00:06:26 +0000 (-0800)
Subject: Remove submodule .git/config submodules for .gitmodules reimport.
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=037bb261a5d4dac20ce3bc7a123b30f514ee4edf;p=autobuild-ceph.git

Remove submodule .git/config submodules for .gitmodules reimport.

When the submodules init is done it takes values from .gitmodules
and imports them into .git/config so when .gitmodules is updated
old values/URLs are sitll used. Instead remove the entries from
.git/config so they can be re-added from .gitmodules.
---

diff --git a/build-ceph-deb-native.sh b/build-ceph-deb-native.sh
index 1be9617..7f19523 100755
--- a/build-ceph-deb-native.sh
+++ b/build-ceph-deb-native.sh
@@ -1,6 +1,12 @@
 #!/bin/sh -x
 set -e
 
+# Remove submodules from .git/config so its re-imported from .gitmodules:
+for submodule in $(git config -l | grep submodule | cut -d'=' -f1)
+do
+    git config --unset $submodule
+done
+
 # pull down submodules
 git submodule foreach 'git clean -fdx && git reset --hard'
 rm -rf ceph-object-corpus
diff --git a/build-ceph-deb.sh b/build-ceph-deb.sh
index 5ff8446..9a542b4 100755
--- a/build-ceph-deb.sh
+++ b/build-ceph-deb.sh
@@ -1,6 +1,12 @@
 #!/bin/sh -x
 set -e
 
+# Remove submodules from .git/config so its re-imported from .gitmodules:
+for submodule in $(git config -l | grep submodule | cut -d'=' -f1)
+do
+    git config --unset $submodule
+done
+
 # pull down submodules
 git submodule foreach 'git clean -fdx && git reset --hard'
 rm -rf ceph-object-corpus
diff --git a/build-ceph-gcov.sh b/build-ceph-gcov.sh
index 77f465b..ebcc330 100755
--- a/build-ceph-gcov.sh
+++ b/build-ceph-gcov.sh
@@ -1,6 +1,12 @@
 #!/bin/sh -x
 set -e
 
+# Remove submodules from .git/config so its re-imported from .gitmodules:
+for submodule in $(git config -l | grep submodule | cut -d'=' -f1)
+do
+    git config --unset $submodule
+done
+
 git submodule foreach 'git clean -fdx && git reset --hard'
 rm -rf ceph-object-corpus
 rm -rf src/leveldb
diff --git a/build-ceph-notcmalloc.sh b/build-ceph-notcmalloc.sh
index 06ff713..4c31513 100755
--- a/build-ceph-notcmalloc.sh
+++ b/build-ceph-notcmalloc.sh
@@ -1,6 +1,12 @@
 #!/bin/sh -x
 set -e
 
+# Remove submodules from .git/config so its re-imported from .gitmodules:
+for submodule in $(git config -l | grep submodule | cut -d'=' -f1)
+do
+    git config --unset $submodule
+done
+
 # pull down submodules
 git submodule foreach 'git clean -fdx && git reset --hard'
 rm -rf ceph-object-corpus
diff --git a/build-ceph-rpm.sh b/build-ceph-rpm.sh
index feefb37..fd45d04 100755
--- a/build-ceph-rpm.sh
+++ b/build-ceph-rpm.sh
@@ -1,6 +1,12 @@
 #!/bin/sh -x
 set -e
 
+# Remove submodules from .git/config so its re-imported from .gitmodules:
+for submodule in $(git config -l | grep submodule | cut -d'=' -f1)
+do
+    git config --unset $submodule
+done
+
 # pull down submodules
 git submodule foreach 'git clean -fdx && git reset --hard'
 rm -rf ceph-object-corpus
diff --git a/build-ceph.sh b/build-ceph.sh
index ba37c4a..2c65f90 100755
--- a/build-ceph.sh
+++ b/build-ceph.sh
@@ -1,6 +1,12 @@
 #!/bin/sh -x
 set -e
 
+# Remove submodules from .git/config so its re-imported from .gitmodules:
+for submodule in $(git config -l | grep submodule | cut -d'=' -f1)
+do
+    git config --unset $submodule
+done
+
 # pull down submodules
 rm -rf ceph-object-corpus
 rm -rf src/leveldb