From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Oct 2013 23:10:25 +0000 (-0700)
Subject: merge-base: use OPT_CMDMODE and clarify the command line parsing
X-Git-Tag: v1.9-rc0~98^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/16e57aec7f672fabe38fa0e4d39252eb9c7a1563?ds=inline;hp=16e57aec7f672fabe38fa0e4d39252eb9c7a1563

merge-base: use OPT_CMDMODE and clarify the command line parsing

The --octopus, --independent and --is-ancestor are mutually
exclusive command modes (in addition to not giving any of these
options), so represent them as such using the recent OPT_CMDMODE
facility available since 11588263 (parse-options: add OPT_CMDMODE(),
2013-07-30), which is in v1.8.4-82-g366b80b.  --all is compatible
only with plain vanilla mode and --octopus mode, and the minimum
number of arguments the command takes depends on the command modes,
so these are now separately checked in each command mode.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---