diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-07-28 13:18:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-28 13:18:03 -0700 |
| commit | fa8b225d864e00703c048d49ff523c3980d6a3b4 (patch) | |
| tree | eb1415636af0e158048435fc1d9141746df5d652 | |
| parent | Merge branch 'en/rename-limits-doc' (diff) | |
| parent | parse-options: don't complete option aliases by default (diff) | |
| download | tgif-fa8b225d864e00703c048d49ff523c3980d6a3b4.tar.xz | |
Merge branch 'pb/dont-complete-aliased-options'
The completion support used to offer alternate spelling of options
that exist only for compatibility, which has been corrected.
* pb/dont-complete-aliased-options:
parse-options: don't complete option aliases by default
| -rw-r--r-- | parse-options.c | 2 | ||||
| -rwxr-xr-x | t/t9902-completion.sh | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/parse-options.c b/parse-options.c index e6f56768ca..2abff136a1 100644 --- a/parse-options.c +++ b/parse-options.c @@ -585,7 +585,7 @@ static int show_gitcomp(const struct option *opts, int show_all) if (!opts->long_name) continue; if (!show_all && - (opts->flags & (PARSE_OPT_HIDDEN | PARSE_OPT_NOCOMPLETE))) + (opts->flags & (PARSE_OPT_HIDDEN | PARSE_OPT_NOCOMPLETE | PARSE_OPT_FROM_ALIAS))) continue; switch (opts->type) { diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index cb057ef161..11573936d5 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -2404,6 +2404,19 @@ test_expect_success 'sourcing the completion script clears cached --options' ' verbose test -z "$__gitcomp_builtin_notes_edit" ' +test_expect_success 'option aliases are not shown by default' ' + test_completion "git clone --recurs" "--recurse-submodules " +' + +test_expect_success 'option aliases are shown with GIT_COMPLETION_SHOW_ALL' ' + . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" && + GIT_COMPLETION_SHOW_ALL=1 && export GIT_COMPLETION_SHOW_ALL && + test_completion "git clone --recurs" <<-\EOF + --recurse-submodules Z + --recursive Z + EOF +' + test_expect_success '__git_complete' ' unset -f __git_wrap__git_main && |