]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'sg/parse-options-subcommand'
authorJunio C Hamano <gitster@pobox.com>
Thu, 1 Sep 2022 20:40:18 +0000 (13:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 1 Sep 2022 20:40:18 +0000 (13:40 -0700)
Introduce the "subcommand" mode to parse-options API and update the
command line parser of Git commands with subcommands.

* sg/parse-options-subcommand: (23 commits)
  remote: run "remote rm" argv through parse_options()
  maintenance: add parse-options boilerplate for subcommands
  pass subcommand "prefix" arguments to parse_options()
  builtin/worktree.c: let parse-options parse subcommands
  builtin/stash.c: let parse-options parse subcommands
  builtin/sparse-checkout.c: let parse-options parse subcommands
  builtin/remote.c: let parse-options parse subcommands
  builtin/reflog.c: let parse-options parse subcommands
  builtin/notes.c: let parse-options parse subcommands
  builtin/multi-pack-index.c: let parse-options parse subcommands
  builtin/hook.c: let parse-options parse subcommands
  builtin/gc.c: let parse-options parse 'git maintenance's subcommands
  builtin/commit-graph.c: let parse-options parse subcommands
  builtin/bundle.c: let parse-options parse subcommands
  parse-options: add support for parsing subcommands
  parse-options: drop leading space from '--git-completion-helper' output
  parse-options: clarify the limitations of PARSE_OPT_NODASH
  parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options
  api-parse-options.txt: fix description of OPT_CMDMODE
  t0040-parse-options: test parse_options() with various 'parse_opt_flags'
  ...

1  2 
builtin/gc.c
builtin/log.c
builtin/reflog.c
builtin/remote.c
git.c
t/helper/test-tool.c
t/helper/test-tool.h
t/t5318-commit-graph.sh
t/t7900-maintenance.sh

diff --cc builtin/gc.c
Simple merge
diff --cc builtin/log.c
Simple merge
Simple merge
Simple merge
diff --cc git.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge