From: Tanga Joris Date: Thu, 05 Nov 2026 00:39:12 GMT Subject: [Outreachy PATCH v4 2/3] git.c: drop NO_PARSEOPT from builtins that use parse-options Message-ID: <20261105003914.708836-2-tangajoris@gmail.com> In-Reply-To: <20261105003914.708836-1-tangajoris@gmail.com> The NO_PARSEOPT flag in the commands[] table marks builtins that parse their options by hand. Builtins marked with it are left out of "git --list-cmds=parseopt", which bash completion uses to decide whether it can ask a command for its options with "--git-completion-helper". Four builtins have since been converted to parse-options, but are still marked NO_PARSEOPT: - patch-id, in 2871f4d447 (builtin: patch-id: add --verbatim as a command mode, 2022-10-24) - diff-pairs, which has used parse-options since it was introduced in 5bd10b2adc (builtin: introduce diff-pairs command, 2025-02-28) - fast-import, in 863937696e (fast-import: use parse_options() for command line options, 2026-08-11) - var, in e19f0779c6 (var: add "-z" output mode, 2026-09-26) This causes "git fast-import --", "git patch-id --" and "git diff-pairs --" to offer no options, even though they are listed by "--git-completion-helper". Remove the flag from these four builtins, like 66fa6e8ed8 (git.c: update NO_PARSEOPT markings, 2022-08-19) did for others. Signed-off-by: Tanga Joris --- git.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/git.c b/git.c index d7b5f88e52..2d27ad4175 100644 --- a/git.c +++ b/git.c @@ -571,11 +571,11 @@ static struct cmd_struct commands[] = { { "diff", cmd_diff, NO_PARSEOPT }, { "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT }, { "diff-index", cmd_diff_index, RUN_SETUP | NO_PARSEOPT }, - { "diff-pairs", cmd_diff_pairs, RUN_SETUP | NO_PARSEOPT }, + { "diff-pairs", cmd_diff_pairs, RUN_SETUP }, { "diff-tree", cmd_diff_tree, RUN_SETUP | NO_PARSEOPT }, { "difftool", cmd_difftool, RUN_SETUP_GENTLY }, { "fast-export", cmd_fast_export, RUN_SETUP }, - { "fast-import", cmd_fast_import, RUN_SETUP | NO_PARSEOPT }, + { "fast-import", cmd_fast_import, RUN_SETUP }, { "fetch", cmd_fetch, RUN_SETUP }, { "fetch-pack", cmd_fetch_pack, RUN_SETUP | NO_PARSEOPT }, { "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP }, @@ -626,7 +626,7 @@ static struct cmd_struct commands[] = { { "pack-redundant", cmd_pack_redundant, RUN_SETUP | NO_PARSEOPT | DEPRECATED }, #endif { "pack-refs", cmd_pack_refs, RUN_SETUP }, - { "patch-id", cmd_patch_id, RUN_SETUP_GENTLY | NO_PARSEOPT }, + { "patch-id", cmd_patch_id, RUN_SETUP_GENTLY }, { "pickaxe", cmd_blame, RUN_SETUP }, { "prune", cmd_prune, RUN_SETUP }, { "prune-packed", cmd_prune_packed, RUN_SETUP }, @@ -676,7 +676,7 @@ static struct cmd_struct commands[] = { { "upload-archive--writer", cmd_upload_archive_writer, NO_PARSEOPT }, { "upload-pack", cmd_upload_pack }, { "url-parse", cmd_url_parse }, - { "var", cmd_var, RUN_SETUP_GENTLY | NO_PARSEOPT }, + { "var", cmd_var, RUN_SETUP_GENTLY }, { "verify-commit", cmd_verify_commit, RUN_SETUP }, { "verify-pack", cmd_verify_pack }, { "verify-tag", cmd_verify_tag, RUN_SETUP }, -- 2.43.0