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 1be961785747a7f1aef87257f6e6a3e9e89480bf..7f1952320e1f1fdd0426eb02d353f81f43fcf094 100755 (executable)
--- 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 5ff84462e34e2425fc9ade17a775305c391db479..9a542b4112babdca9e807cece7f05ab1c7680038 100755 (executable)
--- 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 77f465b047bbef6222fd617ef3ab70e0b47f0802..ebcc3307de0e7a1f43e74bebc2eef76cc6e51ca0 100755 (executable)
--- 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 06ff7138cde1212b0993d8fab70eb091271858da..4c31513c9c31386bb8b4302209498f1c245a2b8a 100755 (executable)
--- 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 feefb37ac0533fb4aa6d5c1afd02b8108b474041..fd45d048e3f9f606f728c4f233dae9b7291f70ff 100755 (executable)
--- 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 ba37c4a1af16de5248493145d54a47dffe4dc996..2c65f90af59f4b81b6f494221ced3f6070a71ef8 100755 (executable)
--- 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