Merge branch 'rr/maint-submodule-unknown-cmd'

* rr/maint-submodule-unknown-cmd:
  submodule: if $command was not matched, don't parse other args
This commit is contained in:
Junio C Hamano
2012-09-29 22:28:32 -07:00
3 changed files with 11 additions and 4 deletions

View File

@ -1107,7 +1107,15 @@ do
done
# No command word defaults to "status"
test -n "$command" || command=status
if test -z "$command"
then
if test $# = 0
then
command=status
else
usage
fi
fi
# "-b branch" is accepted only by "add"
if test -n "$branch" && test "$command" != add