accommodate leading "+" in git submodule output

* cfg.mk (_submodule_hash): Also filter out "+".
* autogen.sh: Likewise.

diff --git a/autogen.sh b/autogen.sh
index 166ca56..6e89c84 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,7 +24,7 @@ set -v
 # Ensure that whenever we pull in a gnulib update or otherwise change to a
 # different version (i.e., when switching branches), we also rerun ./bootstrap.
 curr_status=.git-module-status
 # Ensure that whenever we pull in a gnulib update or otherwise change to a
 # different version (i.e., when switching branches), we also rerun ./bootstrap.
 curr_status=.git-module-status

-t=$(git submodule status|sed 's/^[ -]//;s/ .*//')
+t=$(git submodule status|sed 's/^[ +-]//;s/ .*//')

 if test "$t" = "$(cat $curr_status 2>/dev/null)"; then
     : # good, it's up to date
 else
 if test "$t" = "$(cat $curr_status 2>/dev/null)"; then
     : # good, it's up to date
 else

diff --git a/cfg.mk b/cfg.mk
index 8811d0d..d45ec88 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -134,7 +134,7 @@ ifeq (0,$(MAKELEVEL))
   #  b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib (v0.0-2286-gb653eda)
   # $ cat .git-module-status
   # b653eda3ac4864de205419d9f41eec267cb89eeb
   #  b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib (v0.0-2286-gb653eda)
   # $ cat .git-module-status
   # b653eda3ac4864de205419d9f41eec267cb89eeb

-  _submodule_hash = sed 's/^[ -]//;s/ .*//'
+  _submodule_hash = sed 's/^[ +-]//;s/ .*//'

   _update_required := $(shell                                          \
       actual=$$(git submodule status | $(_submodule_hash));            \
       stamp="$$($(_submodule_hash) $(_curr_status) 2>/dev/null)";      \
   _update_required := $(shell                                          \
       actual=$$(git submodule status | $(_submodule_hash));            \
       stamp="$$($(_submodule_hash) $(_curr_status) 2>/dev/null)";      \