submodule update: make --init a no-op
authorW. Trevor King <wking@tremily.us>
Sun, 2 Dec 2012 13:11:47 +0000 (08:11 -0500)
committerW. Trevor King <wking@tremily.us>
Sun, 2 Dec 2012 18:22:26 +0000 (13:22 -0500)
There's nothing important that happens during the init phase any more.
Keep the option around as a no-op for backwards compatibility.

Signed-off-by: W. Trevor King <wking@tremily.us>
git-submodule.sh

index 7a467c49b4f93cc2baa078c4661eeb9eb81b5259..d48b4ea3547f8e7a54a75dec5be1821f02bbc646 100755 (executable)
@@ -8,7 +8,7 @@ dashless=$(basename "$0" | sed -e 's/-/ /')
 USAGE="[--quiet] add [-b branch] [-f|--force] [--reference <repository>] [--] <repository> [<path>]
    or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]
    or: $dashless [--quiet] init [--] [<path>...]
-   or: $dashless [--quiet] update [--init] [-N|--no-fetch] [-f|--force] [--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...]
+   or: $dashless [--quiet] update [-N|--no-fetch] [-f|--force] [--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...]
    or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
    or: $dashless [--quiet] foreach [--recursive] <command>
    or: $dashless [--quiet] sync [--] [<path>...]"
@@ -24,7 +24,6 @@ force=
 reference=
 cached=
 recursive=
-init=
 files=
 nofetch=
 update=
@@ -650,7 +649,6 @@ cmd_update()
                        GIT_QUIET=1
                        ;;
                -i|--init)
-                       init=1
                        ;;
                -N|--no-fetch)
                        nofetch=1
@@ -694,11 +692,6 @@ cmd_update()
                shift
        done
 
-       if test -n "$init"
-       then
-               cmd_init "--" "$@" || return
-       fi
-
        cloned_modules=
        module_list "$@" | {
        err=