Merge branch 'ph/maint-submodule-status-fix'

Cleans up some leftover bits from an earlier submodule change.

* ph/maint-submodule-status-fix:
  submodule status: remove unused orig_* variables
  t7407: Fix recursive submodule test
This commit is contained in:
Jeff King
2012-11-09 12:51:15 -05:00
2 changed files with 3 additions and 5 deletions

View File

@ -950,7 +950,6 @@ cmd_summary() {
cmd_status()
{
# parse $args after "submodule ... status".
orig_flags=
while test $# -ne 0
do
case "$1" in
@ -974,7 +973,6 @@ cmd_status()
break
;;
esac
orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")"
shift
done
@ -1014,7 +1012,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