cmd_add will later handle the case adding multiple modules, so extract module_add to add a single module. Signed-off-by: Ping Yin <pkufranky@xxxxxxxxx> --- git-submodule.sh | 67 +++++++++++++++++++++++++++++++---------------------- 1 files changed, 39 insertions(+), 28 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index d88e3c3..996bf2c 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -155,34 +155,7 @@ module_clone() # # optional branch is stored in global branch variable # -cmd_add() -{ - # parse $args after "submodule ... add". - while test $# -ne 0 - do - case "$1" in - -b | --branch) - case "$2" in '') usage ;; esac - branch=$2 - shift - ;; - -q|--quiet) - quiet=1 - ;; - --) - shift - break - ;; - -*) - usage - ;; - *) - break - ;; - esac - shift - done - +module_add() { repo=$1 path=$2 @@ -226,6 +199,44 @@ cmd_add() } # +# Add a new submodule to the working tree, .gitmodules and the index +# +# $@ = repo [path] +# +# optional branch is stored in global branch variable +# +cmd_add() +{ + # parse $args after "submodule ... add". + while test $# -ne 0 + do + case "$1" in + -b | --branch) + case "$2" in '') usage ;; esac + branch=$2 + shift + ;; + -q|--quiet) + quiet=1 + ;; + --) + shift + break + ;; + -*) + usage + ;; + *) + break + ;; + esac + shift + done + + module_add "$1" "$2" +} + +# # Register submodules in .git/config # # $@ = requested paths (default to all) -- 1.5.5.23.g2a5f -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html