builtin/submodule--helper: factor out submodule updating

diff --git a/git-submodule.sh b/git-submodule.sh
index 8b5ad59bdee39eba4fc56b28d6771a291dac55f0..8caaf274e25296e18218f55273cefda5bd7777fd 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -531,9 +531,9 @@ cmd_update()
                "$@" || echo "#unmatched" $?
        } | {
        err=
-       while read -r mode sha1 stage just_cloned sm_path
+       while read -r quickabort sha1 just_cloned sm_path
        do
-               die_if_unmatched "$mode" "$sha1"
+               die_if_unmatched "$quickabort" "$sha1"
 
                name=$(git submodule--helper name "$sm_path") || exit
                if ! test -z "$update"
@@ -632,7 +632,7 @@ cmd_update()
                                must_die_on_failure=yes
                                ;;
                        *)
-                               die "$(eval_gettext "Invalid update mode '$update_module' for submodule '$name'")"
+                               die "$(eval_gettext "Invalid update mode '$update_module' for submodule path '$path'")"
                        esac
 
                        if (sanitize_submodule_env; cd "$sm_path" && $command "$sha1")