diff options
| author |  Jens Lehmann <Jens.Lehmann@web.de> | 2012-10-28 22:37:16 +0100 |
|---|---|---|
| committer |  Jeff King <peff@peff.net> | 2012-10-29 03:25:50 -0400 |
| commit | e15bec0ec3b763449e418c12a5f2e128560c556d (patch) | |
| tree | efa7d2fea6e2c229dc11b676fcfcb309c1efba0d | |
| parent | t7407: Fix recursive submodule test (diff) | |
| download | tgif-e15bec0ec3b763449e418c12a5f2e128560c556d.tar.xz | |
submodule status: remove unused orig_* variables
When renaming orig_args to orig_flags in 98dbe63d (submodule: only
preserve flags across recursive status/update invocations) the call site
of the recursive cmd_status was forgotten. At that place orig_args is
still passed into the recursion, which is always empty since then. This
did not break anything because the orig_flags logic is not needed at all
when a function from the submodule script is called with eval, as that
inherits all the variables set by the option parsing done in the first
level of the recursion.
Now that we know that orig_flags and orig_args aren't needed at all,
let's just remove them from cmd_status().
Thanks-to: Phil Hord <hordp@cisco.com>
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Jeff King <peff@peff.net>
| -rwxr-xr-x | git-submodule.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index ab6b1107b6..c287464c2b 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -926,7 +926,6 @@ cmd_summary() { cmd_status() { # parse $args after "submodule ... status". - orig_flags= while test $# -ne 0 do case "$1" in @@ -950,7 +949,6 @@ cmd_status() break ;; esac - orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")" shift done @@ -990,7 +988,7 @@ cmd_status() prefix="$displaypath/" clear_local_git_env cd "$sm_path" && - eval cmd_status "$orig_args" + eval cmd_status ) || die "$(eval_gettext "Failed to recurse into submodule path '\$sm_path'")" fi |