Merge branch 'jc/transport-parseopt-fix'

Command line parser fixes.

* jc/transport-parseopt-fix:
  fetch: reject --no-ipv[46]
  parse-options: introduce OPT_IPVERSION()

diff --cc builtin/clone.c
Simple merge

diff --cc builtin/fetch.c
Simple merge

diff --cc builtin/push.c
Simple merge