From patchwork Thu Nov 12 22:43:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 11902137 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F661C6379F for ; Thu, 12 Nov 2020 22:44:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3B32D2068D for ; Thu, 12 Nov 2020 22:44:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ji5oeZlg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727708AbgKLWoW (ORCPT ); Thu, 12 Nov 2020 17:44:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727558AbgKLWoT (ORCPT ); Thu, 12 Nov 2020 17:44:19 -0500 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A45C0C061A47 for ; Thu, 12 Nov 2020 14:44:19 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id d142so6581633wmd.4 for ; Thu, 12 Nov 2020 14:44:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=Znuj+r+07LlnsRiW9hY8Ldpnh1XWOE6Nj5Z2z0BJdz8=; b=Ji5oeZlgrKwjSYlqPnVKZrWEYcEMcyHfV2+2eXjrDPtobLJCcq2ar6tX1a89pCl3zD hdLqDZ2veY44zKoGzdULLMcE7MDTmy4pr+z8e9KYlD9uO5BjHkmJkIinwvGhu6xl9+bs qs7gqwK7tm4xYyGSL5BB6FecFgpZYpelgUGOVR1HyTf+5fDVztTkMIG/2qAL+r3xTtow v8CZCVVx+uIwOHMRmbjj8vWBCAqbjc8+tSMvS29vKBPlEtQLVW+UPKntHrrbfp+LYpvj SSfDmGCjYVCFJWu2BDHTmeZDBNlkcSRpghDV/IfrngZVT/ie9eheLANBI/r7gL/Z4Xtk oUYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=Znuj+r+07LlnsRiW9hY8Ldpnh1XWOE6Nj5Z2z0BJdz8=; b=Ofabji8SE/2x9SbN8RRxWgzhvg6xnoigfvWpYSFMJ4jZ49JHSmzlKj1OH6pdJfZDYk CQBaAyL1CJIZE1+XcvRWJ0G81htteyXJzMQ6JE+LFL7pi/AYNNT2BmpEhwVgZXcr12fj UyIQ8891kBxmWxJv/Si0ufySyNYs/iwDX8x2JSW1FaVnBXMD5G0s2ysJOko5TmgZY7qq vgZvTWyLIwFo3ffuE18pNv4e9vQp5UpYmw6Mssv5p8KnV6itzB9Zmf4SK/cbOFJ7hHHu P+kYLsGK2XxmI6Z9WPjmi2rPs2JiCTT8K8LZBBFKemAWlCtyycMsWSoUlxaYDoDluID0 Mk0A== X-Gm-Message-State: AOAM530srxb3+a1GWm2fN6p9f+W4HsoqTfQLwk0JUGODCLMGySBPDgdZ Nxj4XinaAt2bI1JGc0C9EoZImayWpnQ= X-Google-Smtp-Source: ABdhPJwy0DSbdlUQHaBhvktuB0gXhrJyXJKnRgmKHbekBqtJoCA8oQBgE7wylXqSd5SiUikEcOEalg== X-Received: by 2002:a05:600c:4147:: with SMTP id h7mr60269wmm.186.1605221058284; Thu, 12 Nov 2020 14:44:18 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c185sm8297253wma.44.2020.11.12.14.44.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 14:44:17 -0800 (PST) Message-Id: <3a987c452eb88c2d18c6eebc9841644516d10e1c.1605221039.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 12 Nov 2020 22:43:52 +0000 Subject: [PATCH 22/28] t8*: adjust the references to the default branch name "main" Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin This trick was performed via $ (cd t && sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t8*.sh annotate*.sh) This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main` for those tests. Signed-off-by: Johannes Schindelin --- t/annotate-tests.sh | 8 ++++---- t/t8001-annotate.sh | 2 +- t/t8003-blame-corner-cases.sh | 4 ++-- t/t8004-blame-with-conflicts.sh | 14 +++++++------- t/test-lib.sh | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh index 3aee61d2cc..ee5d2d4cf8 100644 --- a/t/annotate-tests.sh +++ b/t/annotate-tests.sh @@ -95,7 +95,7 @@ test_expect_success 'blame 2 authors' ' ' test_expect_success 'setup B1 lines (branch1)' ' - git checkout -b branch1 master && + git checkout -b branch1 main && echo "3A slow green fox jumps into the" >>file && echo "well." >>file && GIT_AUTHOR_NAME="B1" GIT_AUTHOR_EMAIL="B1@test.git" \ @@ -107,7 +107,7 @@ test_expect_success 'blame 2 authors + 1 branch1 author' ' ' test_expect_success 'setup B2 lines (branch2)' ' - git checkout -b branch2 master && + git checkout -b branch2 main && sed -e "s/2A quick brown/4A quick brown lazy dog/" file.new && mv file.new file && GIT_AUTHOR_NAME="B2" GIT_AUTHOR_EMAIL="B2@test.git" \ @@ -131,11 +131,11 @@ test_expect_success 'blame --first-parent blames merge for branch1' ' ' test_expect_success 'blame ancestor' ' - check_count -h master A 2 B 2 + check_count -h main A 2 B 2 ' test_expect_success 'blame great-ancestor' ' - check_count -h master^ A 2 + check_count -h main^ A 2 ' test_expect_success 'setup evil merge' ' diff --git a/t/t8001-annotate.sh b/t/t8001-annotate.sh index 72176e42c1..3687fc58d8 100755 --- a/t/t8001-annotate.sh +++ b/t/t8001-annotate.sh @@ -7,7 +7,7 @@ PROG='git annotate' . "$TEST_DIRECTORY"/annotate-tests.sh test_expect_success 'annotate old revision' ' - git annotate file master >actual && + git annotate file main >actual && awk "{ print \$3; }" authors && test 2 = $(grep A > mouse && git mv mouse rodent && git add rodent && GIT_AUTHOR_NAME=Rodent git commit -m "rodent" && - git checkout --detach master && + git checkout --detach main && (git cherry-pick HEAD@{1} || test $? -eq 1) && git show HEAD@{1}:rodent > rodent && git add rodent && diff --git a/t/t8004-blame-with-conflicts.sh b/t/t8004-blame-with-conflicts.sh index 9c353ab222..b6c992ec45 100755 --- a/t/t8004-blame-with-conflicts.sh +++ b/t/t8004-blame-with-conflicts.sh @@ -21,16 +21,16 @@ test_expect_success 'setup first case' ' git add file2 && git commit --author "U Gly " -m ugly && - # Back to master and change something - git checkout master && + # Back to main and change something + git checkout main && echo " bla" >> file1 && git commit --author "Old Line " -a -m file1.b && - # Back to foo and merge master + # Back to foo and merge main git checkout foo && - if git merge master; then + if git merge main; then echo needed conflict here exit 1 else @@ -44,8 +44,8 @@ Even more" > file2 && git rm file1 && git commit --author "M Result " -a -m merged && - # Back to master and change file1 again - git checkout master && + # Back to main and change file1 again + git checkout main && sed s/bla/foo/ X && rm file1 && mv X file1 && @@ -53,7 +53,7 @@ Even more" > file2 && # Try to merge into foo again git checkout foo && - if git merge master; then + if git merge main; then echo needed conflict here exit 1 else diff --git a/t/test-lib.sh b/t/test-lib.sh index 2ef51a4f3f..4ddfb9e3ee 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -263,7 +263,7 @@ case "$TEST_NUMBER" in GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME ;; -[0-7]*) +[0-8]*) GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME ;;