Use --remove-section so empty entires don't keep increasing.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>

diff --git a/build-ceph-deb-native.sh b/build-ceph-deb-native.sh
index 8ab54196577d18645e951abee9ef7709e09e8b08..b972479487dc46c05b59ba7980b93ba5ae675fc1 100755 (executable)
--- a/build-ceph-deb-native.sh
+++ b/build-ceph-deb-native.sh
@@ -2,9 +2,9 @@
 set -e
 
 # Remove submodules from .git/config so its re-imported from .gitmodules:
-for submodule in $(git config -l | grep submodule | cut -d'=' -f1)
+for submodule in $(git config -l | grep submodule | cut -d'.' -f1-2)
 do
-    git config --unset $submodule
+    git config --remove-section  $submodule
 done
 
 git clean -fdx && git reset --hard

diff --git a/build-ceph-deb.sh b/build-ceph-deb.sh
index e4f6c6f7c434210d45586cfa3620082590f2fa31..4de28be784ab7d10a4174d42d36e54d77dd16ffd 100755 (executable)
--- a/build-ceph-deb.sh
+++ b/build-ceph-deb.sh
@@ -2,9 +2,9 @@
 set -e
 
 # Remove submodules from .git/config so its re-imported from .gitmodules:
-for submodule in $(git config -l | grep submodule | cut -d'=' -f1)
+for submodule in $(git config -l | grep submodule | cut -d'.' -f1-2)
 do
-    git config --unset $submodule
+    git config --remove-section  $submodule
 done
 
 git clean -fdx && git reset --hard

diff --git a/build-ceph-gcov.sh b/build-ceph-gcov.sh
index 329f76650c9e7e7591e7bb302e0470413dee6e87..0ea2c4e775b64214fd393c8dc55706d096df5f24 100755 (executable)
--- a/build-ceph-gcov.sh
+++ b/build-ceph-gcov.sh
@@ -2,9 +2,9 @@
 set -e
 
 # Remove submodules from .git/config so its re-imported from .gitmodules:
-for submodule in $(git config -l | grep submodule | cut -d'=' -f1)
+for submodule in $(git config -l | grep submodule | cut -d'.' -f1-2)
 do
-    git config --unset $submodule
+    git config --remove-section  $submodule
 done
 
 git clean -fdx && git reset --hard

diff --git a/build-ceph-notcmalloc.sh b/build-ceph-notcmalloc.sh
index f142a2f42070e5b5123169c36af9d9f3a98bd3b1..106225d62d852cae1bf27a42b282473d6f133519 100755 (executable)
--- a/build-ceph-notcmalloc.sh
+++ b/build-ceph-notcmalloc.sh
@@ -2,9 +2,9 @@
 set -e
 
 # Remove submodules from .git/config so its re-imported from .gitmodules:
-for submodule in $(git config -l | grep submodule | cut -d'=' -f1)
+for submodule in $(git config -l | grep submodule | cut -d'.' -f1-2)
 do
-    git config --unset $submodule
+    git config --remove-section  $submodule
 done
 
 git clean -fdx && git reset --hard

diff --git a/build-ceph-rpm.sh b/build-ceph-rpm.sh
index b67c80ad6fc1abdd678201de28294e14a953623d..ec1f43ea3ed7e57ef4dd7f40cd39295d40180725 100755 (executable)
--- a/build-ceph-rpm.sh
+++ b/build-ceph-rpm.sh
@@ -2,9 +2,9 @@
 set -e
 
 # Remove submodules from .git/config so its re-imported from .gitmodules:
-for submodule in $(git config -l | grep submodule | cut -d'=' -f1)
+for submodule in $(git config -l | grep submodule | cut -d'.' -f1-2)
 do
-    git config --unset $submodule
+    git config --remove-section  $submodule
 done
 
 git clean -fdx && git reset --hard

diff --git a/build-ceph.sh b/build-ceph.sh
index 32c6ceb19e04ca27713ceb567b420e0de1440aed..0165ee8209276c88b447aaabdf6bf1c8f4a62e53 100755 (executable)
--- a/build-ceph.sh
+++ b/build-ceph.sh
@@ -2,9 +2,9 @@
 set -e
 
 # Remove submodules from .git/config so its re-imported from .gitmodules:
-for submodule in $(git config -l | grep submodule | cut -d'=' -f1)
+for submodule in $(git config -l | grep submodule | cut -d'.' -f1-2)
 do
-    git config --unset $submodule
+    git config --remove-section  $submodule
 done
 
 git clean -fdx && git reset --hard