t9902: use a non-deprecated command for testing
t9902 had a list of three random porcelain commands as a sanity check, one of which was filter-branch. Since we are recommending people not use filter-branch, let's update this test to use rebase instead of filter-branch. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
9df53c5de6
commit
483e861111
@ -28,10 +28,10 @@ complete ()
|
|||||||
#
|
#
|
||||||
# (2) A test makes sure that common subcommands are included in the
|
# (2) A test makes sure that common subcommands are included in the
|
||||||
# completion for "git <TAB>", and a plumbing is excluded. "add",
|
# 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_ALL_COMMAND_LIST='add checkout check-attr rebase ls-files'
|
||||||
GIT_TESTING_PORCELAIN_COMMAND_LIST='add checkout filter-branch'
|
GIT_TESTING_PORCELAIN_COMMAND_LIST='add checkout rebase'
|
||||||
|
|
||||||
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash"
|
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash"
|
||||||
|
|
||||||
@ -1392,12 +1392,12 @@ test_expect_success 'basic' '
|
|||||||
# built-in
|
# built-in
|
||||||
grep -q "^add \$" out &&
|
grep -q "^add \$" out &&
|
||||||
# script
|
# script
|
||||||
grep -q "^filter-branch \$" out &&
|
grep -q "^rebase \$" out &&
|
||||||
# plumbing
|
# plumbing
|
||||||
! grep -q "^ls-files \$" out &&
|
! grep -q "^ls-files \$" out &&
|
||||||
|
|
||||||
run_completion "git f" &&
|
run_completion "git r" &&
|
||||||
! grep -q -v "^f" out
|
! grep -q -v "^r" out
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'double dash "git" itself' '
|
test_expect_success 'double dash "git" itself' '
|
||||||
|
Reference in New Issue
Block a user