Suggested changes by Eric Sunshine included. Within the builtin/ folder all occurrences of OPT_BOOLEAN have been removed. Now we only need to review the usage of it in parse-options as used in OPT__VERBOSE, OPT__QUIET, OPT__DRY_RUN and OPT__FORCE. Most likely we could just use OPT_SET_INT there and then OPT_BOOLEAN is gone. The patch 1 and 2 are not intended to change any semantics, but were the most work, because of the checking for each place not changing the semantics. Patch 3 introduces -q the shortform of --quiet for log and format-patch Patch 4,5 are unspectacular, just improving readability. Patch 6 is indeed the only occurence, where I needed to use OPT_COUNTUP for OPT_BOOLEAN. Personally I'd change it there as well, but it's plumbing. Patch 7 makes git config a little more flexible (allowing --global multiple times). Patch 8 is a change in the plumbing layer, what I'd call a bugfix, not urgent, but still. Patch 9 introduces the new OPT_CMDMODE to revert. Junio suggested to change the OPT_CMDMODE a little and use the short parameter as the value assigned to the command variable. This patch shows, why it might not be a good idea, as the options there do not have short parameters. Stefan Beller (9): Remove deprecated OPTION_BOOLEAN for parsing arguments Replace deprecated OPT_BOOLEAN by OPT_BOOL log, format-patch: parsing uses OPT__QUIET checkout: remove superfluous local variable branch, commit, name-rev: ease up boolean conditions hash-object: Replace stdin parsing OPT_BOOLEAN by OPT_COUNTUP config parsing options: allow one flag multiple times checkout-index: Fix negations of even numbers of -n revert: use the OPT_CMDMODE for parsing, reducing code Documentation/git-format-patch.txt | 1 + builtin/apply.c | 24 +++++++-------- builtin/bisect--helper.c | 8 ++--- builtin/blame.c | 8 ++--- builtin/branch.c | 13 ++++---- builtin/check-attr.c | 8 ++--- builtin/check-ignore.c | 12 ++++---- builtin/checkout-index.c | 8 ++--- builtin/checkout.c | 27 ++++++++--------- builtin/clean.c | 6 ++-- builtin/clone.c | 23 +++++++------- builtin/commit.c | 48 ++++++++++++++--------------- builtin/config.c | 8 ++--- builtin/describe.c | 20 ++++++------ builtin/fast-export.c | 10 +++--- builtin/fetch.c | 24 +++++++-------- builtin/fsck.c | 16 +++++----- builtin/gc.c | 4 +-- builtin/grep.c | 38 +++++++++++------------ builtin/hash-object.c | 8 ++--- builtin/log.c | 17 +++++------ builtin/ls-files.c | 24 +++++++-------- builtin/ls-tree.c | 6 ++-- builtin/merge-base.c | 10 +++--- builtin/merge-file.c | 2 +- builtin/merge.c | 12 ++++---- builtin/mv.c | 2 +- builtin/name-rev.c | 14 ++++----- builtin/notes.c | 12 ++++---- builtin/push.c | 6 ++-- builtin/remote.c | 28 ++++++++--------- builtin/replace.c | 6 ++-- builtin/reset.c | 2 +- builtin/rev-parse.c | 4 +-- builtin/revert.c | 62 +++++++++----------------------------- builtin/rm.c | 6 ++-- builtin/shortlog.c | 12 ++++---- builtin/show-branch.c | 28 ++++++++--------- builtin/show-ref.c | 15 +++++---- builtin/tag.c | 4 +-- builtin/update-ref.c | 4 +-- parse-options.h | 5 ++- 42 files changed, 278 insertions(+), 317 deletions(-) -- 1.8.4.rc0.16.g7fca822.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html