summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcontrib/completion/git-completion.bash2
-rwxr-xr-xt/t9902-completion.sh16
2 files changed, 18 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 8c91faf1af..b837704a85 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2640,8 +2640,10 @@ _git ()
--version
--exec-path
--html-path
+ --info-path
--work-tree=
--namespace=
+ --no-replace-objects
--help
"
;;
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index de1c3e91d3..0c0cd4100e 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -180,8 +180,10 @@ test_expect_success 'double dash "git" itself' '
--version Z
--exec-path Z
--html-path Z
+ --info-path Z
--work-tree=
--namespace=
+ --no-replace-objects Z
--help Z
EOF
test_completion "git --"
@@ -202,4 +204,18 @@ test_expect_success 'double dash "git checkout"' '
test_completion "git checkout --"
'
+test_expect_success 'general options' '
+ test_completion "git --ver" "--version " &&
+ test_completion "git --hel" "--help " &&
+ test_completion "git --exe" "--exec-path " &&
+ test_completion "git --htm" "--html-path " &&
+ test_completion "git --pag" "--paginate " &&
+ test_completion "git --no-p" "--no-pager " &&
+ test_completion "git --git" "--git-dir=" &&
+ test_completion "git --wor" "--work-tree=" &&
+ test_completion "git --nam" "--namespace=" &&
+ test_completion "git --bar" "--bare " &&
+ test_completion "git --inf" "--info-path " &&
+ test_completion "git --no-r" "--no-replace-objects "
+'
test_done