From: Johannes Sixt Date: Thu, 12 Oct 2017 16:50:24 GMT Subject: Re: [PATCH v1 1/1] completion: add remaining flags to checkout Message-ID: <5bc82075-0fb2-0929-2da7-d9069222a3fe@kdbg.org> In-Reply-To: <20171012122059.17242-1-thomas.braun@virtuell-zuhause.de> Am 12.10.2017 um 14:20 schrieb Thomas Braun: > In the commits 1d0fa898 (checkout: add --ignore-other-wortrees, > 2015-01-03), 1fc458d9 (builtin/checkout: add --recurse-submodules switch, > 2017-03-14), 870ebdb9 (checkout: add --progress option, 2015-11-01), > 08d595dc (checkout: add --ignore-skip-worktree-bits in sparse checkout > mode, 2013-04-13), 1d0fa898 (checkout: add --ignore-other-wortrees, > 2015-01-03), 32669671 (checkout: introduce --detach synonym for "git > checkout foo^{commit}", 2011-02-08) and db941099 (checkout -f: allow > ignoring unmerged paths when checking out of the index, 2008-08-30) > checkout gained new flags but the completion was not updated, although > these flags are useful completions. Add them. > > Signed-off-by: Thomas Braun > --- > contrib/completion/git-completion.bash | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash > index d934417475..393d4ae230 100644 > --- a/contrib/completion/git-completion.bash > +++ b/contrib/completion/git-completion.bash > @@ -1250,7 +1250,9 @@ _git_checkout () > --*) > __gitcomp " > --quiet --ours --theirs --track --no-track --merge > - --conflict= --orphan --patch > + --conflict= --orphan --patch --detach --progress --no-progress > + --force --ignore-skip-worktree-bits --ignore-other-worktrees Destructive and dangerous options are typically not offered by command completion. You should omit all three in the line above, IMO. Furthermore, --progress and --no-progress are not useful in daily work on the command line, I think. By offering them, --p would not complete to --patch anymore, you would need --pa. You should omit them, too. > + --recurse-submodules --no-recurse-submodules > " > ;; > *) > -- Hannes