From patchwork Fri Aug 30 05:57:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 11122955 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A3480174A for ; Fri, 30 Aug 2019 05:57:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F3FA2186A for ; Fri, 30 Aug 2019 05:57:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="U9YVCNUN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727521AbfH3F5U (ORCPT ); Fri, 30 Aug 2019 01:57:20 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:45004 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727434AbfH3F5T (ORCPT ); Fri, 30 Aug 2019 01:57:19 -0400 Received: by mail-pf1-f193.google.com with SMTP id c81so3866353pfc.11 for ; Thu, 29 Aug 2019 22:57:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AJjCFrB5UTcHzjbEFgl5FcYB+nuFOQyoQyWUFVGr7Bg=; b=U9YVCNUNXlarfNvv9u+kSsrChqDqBY5M4aMlOD1sn0ZHr/QdMukmpm/BBC/wm9mUVP dwwGWVaG9OfdRZfoBYAzipR6hwtr+G640KIJKg8tdd1hLtFFLsQESH+PJ229oW5lFVZ2 ZKzmpUPioSBBYoDicWp7Q9aDJjF57pdHdd0M1p1IzRa6Ae6OeXgKfN90tsODhmMnuCqI xX0LhP5Cb4IqRdJ2s8PHD8fcMaOmWwpemybOAEaiKcQwyoSJJbOUWQknTKlIUxHHJ8Kq 9JWPQAv0CMHPTl8/lD61iw1qDM5lm3LzR4a6/85aAcuBN3cUIrgoIaBDop3tQGfnvIGm Hbjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AJjCFrB5UTcHzjbEFgl5FcYB+nuFOQyoQyWUFVGr7Bg=; b=PI19dB47HEDJ7AADEdiXUapy1QV5xID4w8MlFaFU/ubZ23iEZJqNo1ZNHXjZAHU9cu ibyNnhLsuNvwGJSfVCMY9tdFKL+ByKYUdauxkDOVYKIs4KKO4rXgPn0fuA+qdt1ibV/m PpSRLuH8vJhS0B76ni8E5oPPI8+94YLQwAitqlzft5VFtOFcisFxh+G45HjjcHiQpik0 iYGPe3/G+RMGEy77ESTdwkHq8YfgtmTBi3kBS8IEpiAlO0ONFf6xJygZ0xxfWNXCMCmV N8aLDsbIjERYzrDuUSDgPz/7gjuMft5G46fIAxCN2GInVrsNXZ3jp0uinMcP+UCeCfLC yaeA== X-Gm-Message-State: APjAAAXlAiCEWJylXAxJ7B2vZKgWe8FE41w6mCD8iUdZ2jLYxOSm95PZ xRBdURFWSDmBm0qQwDZc0WGJFNo8YGA= X-Google-Smtp-Source: APXvYqzHyTQYt3SL7iQOXEzfvamH0nxN3B2xprcX2KGN8A2/0zFd1V4iw9JuAFz4in3VihNEC8gnQw== X-Received: by 2002:a62:e910:: with SMTP id j16mr16568742pfh.123.1567144638455; Thu, 29 Aug 2019 22:57:18 -0700 (PDT) Received: from newren2-linux.yojoe.local ([8.4.231.67]) by smtp.gmail.com with ESMTPSA id b136sm5771139pfb.73.2019.08.29.22.57.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Aug 2019 22:57:18 -0700 (PDT) From: Elijah Newren To: git@vger.kernel.org Cc: Junio C Hamano , Derrick Stolee , Eric Wong , Jeff King , =?utf-8?b?w4Z2YXIgQXJu?= =?utf-8?b?ZmrDtnLDsCBCamFybWFzb24=?= , Johannes Schindelin , Lars Schneider , Jonathan Nieder , Eric Sunshine , Elijah Newren Subject: [PATCH v4 4/4] t9902: use a non-deprecated command for testing Date: Thu, 29 Aug 2019 22:57:07 -0700 Message-Id: <20190830055707.7785-5-newren@gmail.com> X-Mailer: git-send-email 2.23.0.38.g892688c90e In-Reply-To: <20190830055707.7785-1-newren@gmail.com> References: <20190829000657.26415-1-newren@gmail.com> <20190830055707.7785-1-newren@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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 --- t/t9902-completion.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 75512c3403..4e7f669c76 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 ", 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' '