From 12cee06388e0265c61e73bf20a2a8a5c68b508d6 Mon Sep 17 00:00:00 2001 From: discomfitor Date: Thu, 2 Jan 2014 17:23:06 -0500 Subject: [PATCH] make configure not clobber modified submodules at all this fixes issue #522 (maybe?) by not cleaning/resetting submodules which are dirty. it does not block completion of configure. --- configure | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configure b/configure index b6fc8368288..e5b41725edd 100755 --- a/configure +++ b/configure @@ -456,9 +456,8 @@ then need_ok "git failed" msg "git: submodule clobber" - "${CFG_GIT}" submodule foreach --recursive git clean -dxf - need_ok "git failed" - "${CFG_GIT}" submodule foreach --recursive git checkout . + "${CFG_GIT}" submodule foreach --recursive \ + 'if [ -n "$(git status --porcelain)" ] ; then echo "Refusing to clobber $path" ; else git clean -dxf ; git checkout . ; fi' need_ok "git failed" cd ${CFG_BUILD_DIR}