Merge pull request #3900 from dachary/wip-recursive-submodules

autogen.sh: do not submodule --force if git does not support it
ceph · Mar 7, 2015 · a19f92c · a19f92c
2 parents 39adebb + 9748d45
commit a19f92c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/autogen.sh b/autogen.sh
@@ -29,7 +29,8 @@ else
 fi
 
 if test -d ".git" ; then
-  if ! git submodule sync || ! git submodule update --force --init --recursive; then
+  force=$(if git submodule usage 2>&1 | grep --quiet 'update.*--force'; then echo --force ; fi)
+  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