diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-09-30 04:19:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-30 04:19:29 (GMT) |
| commit | 91243b019ddba5248f0fde319bc75e4e2b5602b0 (patch) | |
| tree | d551e69310943710f453b89a39f6408c9d9d9242 /t/t9902-completion.sh | |
| parent | 9bc67b6658a031b92cba4a7489b78a4da902ecbf (diff) | |
| parent | 483e861111444b1e7c5c6a8442f2a306508adfb0 (diff) | |
| download | git-91243b019ddba5248f0fde319bc75e4e2b5602b0.zip git-91243b019ddba5248f0fde319bc75e4e2b5602b0.tar.gz git-91243b019ddba5248f0fde319bc75e4e2b5602b0.tar.bz2 | |
Merge branch 'en/filter-branch-deprecation'
Start discouraging the use of "git filter-branch".
* en/filter-branch-deprecation:
t9902: use a non-deprecated command for testing
Recommend git-filter-repo instead of git-filter-branch
t6006: simplify, fix, and optimize empty message test
Diffstat (limited to 't/t9902-completion.sh')
| -rwxr-xr-x | t/t9902-completion.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 5d98d66..54f8ce1 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -28,10 +28,10 @@ complete () # # (2) A test makes sure that common subcommands are included in the # completion for "git <TAB>", and a plumbing is excluded. "add", -# "filter-branch" and "ls-files" are listed for this. +# "rebase" and "ls-files" are listed for this. -GIT_TESTING_ALL_COMMAND_LIST='add checkout check-attr filter-branch ls-files' -GIT_TESTING_PORCELAIN_COMMAND_LIST='add checkout filter-branch' +GIT_TESTING_ALL_COMMAND_LIST='add checkout check-attr rebase ls-files' +GIT_TESTING_PORCELAIN_COMMAND_LIST='add checkout rebase' . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" @@ -1392,12 +1392,12 @@ test_expect_success 'basic' ' # built-in grep -q "^add \$" out && # script - grep -q "^filter-branch \$" out && + grep -q "^rebase \$" out && # plumbing ! grep -q "^ls-files \$" out && - run_completion "git f" && - ! grep -q -v "^f" out + run_completion "git r" && + ! grep -q -v "^r" out ' test_expect_success 'double dash "git" itself' ' |