Skip to content

Commit 6357d9d

Browse files
t-bgitster
authored andcommitted
completion: add remaining flags to checkout
In the commits 1fc458d (builtin/checkout: add --recurse-submodules switch, 2017-03-14), 08d595d (checkout: add --ignore-skip-worktree-bits in sparse checkout mode, 2013-04-13) and 3266967 (checkout: introduce --detach synonym for "git checkout foo^{commit}", 2011-02-08) checkout gained new flags but the completion was not updated, although these flags are useful completions. Add them. The flags --force and --ignore-other-worktrees are not added as they are potentially dangerous. The flags --progress and --no-progress are only useful for scripting and are therefore also not included. Signed-off-by: Thomas Braun <[email protected]> Reviewed-by: Johannes Sixt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ba78f39 commit 6357d9d

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

contrib/completion/git-completion.bash

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1250,7 +1250,8 @@ _git_checkout ()
12501250
--*)
12511251
__gitcomp "
12521252
--quiet --ours --theirs --track --no-track --merge
1253-
--conflict= --orphan --patch
1253+
--conflict= --orphan --patch --detach --ignore-skip-worktree-bits
1254+
--recurse-submodules --no-recurse-submodules
12541255
"
12551256
;;
12561257
*)

t/t9902-completion.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,6 +1245,10 @@ test_expect_success 'double dash "git checkout"' '
12451245
--conflict=
12461246
--orphan Z
12471247
--patch Z
1248+
--detach Z
1249+
--ignore-skip-worktree-bits Z
1250+
--recurse-submodules Z
1251+
--no-recurse-submodules Z
12481252
EOF
12491253
'
12501254

0 commit comments

Comments
 (0)