From patchwork Sat Oct 31 19:46:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 11871755 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 38F2CC388F9 for ; Sat, 31 Oct 2020 19:46:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EFBAA206E9 for ; Sat, 31 Oct 2020 19:46:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Pbfn/vVt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728424AbgJaTqJ (ORCPT ); Sat, 31 Oct 2020 15:46:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725786AbgJaTqJ (ORCPT ); Sat, 31 Oct 2020 15:46:09 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 627EBC0617A6 for ; Sat, 31 Oct 2020 12:46:07 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id n18so10070340wrs.5 for ; Sat, 31 Oct 2020 12:46:07 -0700 (PDT) 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=w8nUu7BRu2aWbJhnGf+2WSKb3qUph8o2g10+K0DHJSw=; b=Pbfn/vVtCW7C4/IPk6krqsIz5rvp5k1DH3EzyMN5DfN7LsMbeIQzgm4+xF7GM05eYB DNIRKr0sALoxO+er1LEz/K/1m0kWqM9LbPBMMUQcYCxLKI1B5VnV2DewqPsZO/1JYr12 tSYDyhquNHXnF0oLe+0FJKVEA4Zj5FM2jNIggNiJ+x9o+qXM+nbXypa4AYk8hbYheZUK Y4rXBdXr0JVxFMsy0ogSW+6rNrcqpkbtvXfQ9E1OVm9rKN3F1FjuYy5aYHpLQrvSuOyJ wSNOPSadXieLWkIxAFIxZFa7zA4SIXrY+UieeEcWtlbhw1F/ajauyMygxR3LtbvuwGOG 86LQ== 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=w8nUu7BRu2aWbJhnGf+2WSKb3qUph8o2g10+K0DHJSw=; b=THQdDZieuPbirZFOX7MtnmlHr4ZWqvSfIvJ5R7BGuLVOK/WY+yHAiGXnYyTCUWh1C6 x5C401VygM3FOfbp8pLzF8D2lp0IlWjAPlHcfPS21oo9gu1D4NPfmgycfy42d8e/QnR0 21tZZLezH9eET0t74cA94ODHFviS7JoY5yk1Ef+GULbwXMQhzB7uwDPT2cau1RCADyEw I+xgbSFqFwlSTMPx0IZ3G9lxt8h5VzbpEtkmCCixJerO+DBCSpljJybkLlYAmcjg35HF YwdbMQEvj+uNo5XnL3c118xFd+aVmq+quOv+n3LPfnAogrBZ2h7vLlz+VIoY86+5PRYB 97jQ== X-Gm-Message-State: AOAM530SIId8/JSRACGxspBFFV3BXRpWU8fEa4BGTYgiXRLBmzy8KX77 Gg1OvW1DwT1a6NKID198Al5xKRXRwSc= X-Google-Smtp-Source: ABdhPJx/KJoY//7DTi5l/NJL5usSO9Xe5tU3lKyc+Oh1WfVQy9greV7kjTbywEf3b3/Nm2UpVLTrbA== X-Received: by 2002:a5d:67ca:: with SMTP id n10mr10768585wrw.209.1604173566041; Sat, 31 Oct 2020 12:46:06 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id m12sm14660948wrs.92.2020.10.31.12.46.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Oct 2020 12:46:05 -0700 (PDT) Message-Id: <9b1c7eb0b4a007c4820aefeb221374887c8d9f8f.1604173563.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 31 Oct 2020 19:46:00 +0000 Subject: [PATCH v2 1/4] t5411: start using the default branch name "main" Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin This is a straight-forward search-and-replace in the test script; However, this is not yet complete because it requires many more replacements in `t/t5411/`, too many for a single patch (the Git mailing list rejects mails larger than 100kB). For that reason, we disable this test script temporarily via the `PREPARE_FOR_MAIN_BRANCH` prereq. Signed-off-by: Johannes Schindelin --- t/t5411-proc-receive-hook.sh | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/t/t5411-proc-receive-hook.sh b/t/t5411-proc-receive-hook.sh index 746487286f..6da6f597a5 100755 --- a/t/t5411-proc-receive-hook.sh +++ b/t/t5411-proc-receive-hook.sh @@ -5,13 +5,21 @@ test_description='Test proc-receive hook' +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME + . ./test-lib.sh +test_have_prereq PREPARE_FOR_MAIN_BRANCH || { + test_skip="In transit for the default branch name 'main'" + test_done +} + . "$TEST_DIRECTORY"/t5411/common-functions.sh setup_upstream_and_workbench () { - # Refs of upstream : master(A) - # Refs of workbench: master(A) tags/v123 + # Refs of upstream : main(A) + # Refs of workbench: main(A) tags/v123 test_expect_success "setup upstream and workbench" ' rm -rf upstream.git && rm -rf workbench && @@ -25,10 +33,10 @@ setup_upstream_and_workbench () { git config core.abbrev 7 && git tag -m "v123" v123 $A && git remote add origin ../upstream.git && - git push origin master && - git update-ref refs/heads/master $A $B && + git push origin main && + git update-ref refs/heads/main $A $B && git -C ../upstream.git update-ref \ - refs/heads/master $A $B + refs/heads/main $A $B ) && TAG=$(git -C workbench rev-parse v123) && @@ -99,8 +107,8 @@ start_httpd # Re-initialize the upstream repository and local workbench. setup_upstream_and_workbench -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 test_expect_success "setup for HTTP protocol" ' git -C upstream.git config http.receivepack true && upstream="$HTTPD_DOCUMENT_ROOT_PATH/upstream.git" && From patchwork Sat Oct 31 19:46:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain via GitGitGadget X-Patchwork-Id: 11871759 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 9306FC55178 for ; Sat, 31 Oct 2020 19:46:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 45FDC206E9 for ; Sat, 31 Oct 2020 19:46:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="d5Zl9Lm2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728446AbgJaTqL (ORCPT ); Sat, 31 Oct 2020 15:46:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728432AbgJaTqK (ORCPT ); Sat, 31 Oct 2020 15:46:10 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13196C0617A7 for ; Sat, 31 Oct 2020 12:46:10 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id h22so5847254wmb.0 for ; Sat, 31 Oct 2020 12:46:09 -0700 (PDT) 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=deyJN4aJGHxT7BF1OvP7ApvWrHvhwEBRzGqFrzZ82D0=; b=d5Zl9Lm2vY/ghWDrdzpb+vkn02ny2IuCeCMWQ/CBm3QLd93xurZDfP02Qk0tLBylLg 8MTWYF5bM3QzbCdZEIw0ijKy6NYVb4ogIs5Sa4dCQ/qAkPb+KK4qikH4mliZsWUn7jAI oLuSIllHg56JoV5WLr353Hj7/rIgsGULIJrmpBYVUj1UaUls3YEGVRvvng1w6sxoTtjp Ei3vNeHRx4n9rTbXM9jpUy46FbiTPmnGAkFtngJZkt3Rn6IifKXZ8mhwPhxYZ40URINn KlDk2geI+4/lavQYLCLaNc/lJi6WDvmMIH096QmPxcWVxi/ByIO09yfr6odllbfU8T2r LwdA== 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=deyJN4aJGHxT7BF1OvP7ApvWrHvhwEBRzGqFrzZ82D0=; b=UKSn3irYQDXJZ89s9ommMkoEJmbd+pTV5/jMFQIjCaXiEIxjmMXTr2aWdjprJ7WGN9 H9A/T9B7dBnOdcIm5H3u1Px7rCZu5A/DcD1f69EfnOuE/3ZsX9+MnFX0x0QgwSucgpUl 0UyV/1w0h8r1EYBBPsTmIowQNzMqPJIaOJDCjueUfSjMewwt78DIrG2bs8TJ9tLxpPOY dxMdQfy64867UHVd6ChQlRfswW0yn7iA3DRT+fkKoZ5wWovOM6xXVdVD6MESyTCff62u hLOQXKe/gcLyMFkp/GzAzo88IWt02lLxnHBH+74sdaM0iZlvCo0/gU4/CkX72UgkR5nx tc9g== X-Gm-Message-State: AOAM531BWn7JpDY+fAPyETlF/TSDbuDtnvsHfjrDPN0lrFS//UDJZ+zo og28wDGowq/Oofhri1mKBsqBifyLEBA= X-Google-Smtp-Source: ABdhPJx6XvywjJoBTCsm4V+i0jGZDYo74bVT+Zeko8aP7dsG3vzlMbkE+JY/pVI2eKALcFpfM1D/ow== X-Received: by 2002:a05:600c:230b:: with SMTP id 11mr4164915wmo.138.1604173566966; Sat, 31 Oct 2020 12:46:06 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id r10sm128954wmg.16.2020.10.31.12.46.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Oct 2020 12:46:06 -0700 (PDT) Message-Id: <0667f182449a8c18df53326bed0f7555aea4029c.1604173563.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Date: Sat, 31 Oct 2020 19:46:01 +0000 Subject: [PATCH v2 2/4] t5411: start adjusting the support files for init.defaultBranch=main Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin This trick was performed via $ sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t/t5411/test-00[3-5]* We do not convert the files in `t/t5411/` in one go because the patch would be too big (mails larger than 100kB are rejected by the Git mailing list). Instead, we start with roughly half of the support files. Signed-off-by: Johannes Schindelin --- t/t5411/test-0030-report-ok.sh | 22 ++-- t/t5411/test-0031-report-ok--porcelain.sh | 22 ++-- t/t5411/test-0032-report-with-options.sh | 120 +++++++++--------- ...est-0033-report-with-options--porcelain.sh | 120 +++++++++--------- t/t5411/test-0034-report-ft.sh | 30 ++--- t/t5411/test-0035-report-ft--porcelain.sh | 30 ++--- ...t-0036-report-multi-rewrite-for-one-ref.sh | 90 ++++++------- ...rt-multi-rewrite-for-one-ref--porcelain.sh | 82 ++++++------ t/t5411/test-0038-report-mixed-refs.sh | 40 +++--- .../test-0039-report-mixed-refs--porcelain.sh | 40 +++--- t/t5411/test-0040-process-all-refs.sh | 42 +++--- .../test-0041-process-all-refs--porcelain.sh | 42 +++--- ...t-0050-proc-receive-refs-with-modifiers.sh | 42 +++--- 13 files changed, 361 insertions(+), 361 deletions(-) diff --git a/t/t5411/test-0030-report-ok.sh b/t/t5411/test-0030-report-ok.sh index 44c99d3831..5d6feef118 100644 --- a/t/t5411/test-0030-report-ok.sh +++ b/t/t5411/test-0030-report-ok.sh @@ -2,34 +2,34 @@ test_expect_success "setup proc-receive hook (ok, $PROTOCOL)" ' write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" + -r "ok refs/for/main/topic" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic test_expect_success "proc-receive: ok ($PROTOCOL)" ' git -C workbench push origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/for/main/topic remote: # post-receive hook - remote: post-receive< refs/for/master/topic + remote: post-receive< refs/for/main/topic To - * [new reference] HEAD -> refs/for/master/topic + * [new reference] HEAD -> refs/for/main/topic EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' diff --git a/t/t5411/test-0031-report-ok--porcelain.sh b/t/t5411/test-0031-report-ok--porcelain.sh index 3223b26184..91666d32df 100644 --- a/t/t5411/test-0031-report-ok--porcelain.sh +++ b/t/t5411/test-0031-report-ok--porcelain.sh @@ -2,35 +2,35 @@ test_expect_success "setup proc-receive hook (ok, $PROTOCOL/porcelain)" ' write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" + -r "ok refs/for/main/topic" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic test_expect_success "proc-receive: ok ($PROTOCOL/porcelain)" ' git -C workbench push --porcelain origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/for/main/topic remote: # post-receive hook - remote: post-receive< refs/for/master/topic + remote: post-receive< refs/for/main/topic To - * HEAD:refs/for/master/topic [new reference] + * HEAD:refs/for/main/topic [new reference] Done EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' diff --git a/t/t5411/test-0032-report-with-options.sh b/t/t5411/test-0032-report-with-options.sh index b77b78c49f..a0faf5c7ff 100644 --- a/t/t5411/test-0032-report-with-options.sh +++ b/t/t5411/test-0032-report-with-options.sh @@ -7,24 +7,24 @@ test_expect_success "setup proc-receive hook (option without matching ok, $PROTO EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A) test_expect_success "proc-receive: report option without matching ok ($PROTOCOL)" ' test_must_fail git -C workbench push origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic + remote: proc-receive< refs/for/main/topic remote: proc-receive> option refname refs/pull/123/head remote: proc-receive> option old-oid remote: error: proc-receive reported "option" without a matching "ok/ng" directive To - ! [remote rejected] HEAD -> refs/for/master/topic (proc-receive failed to report status) + ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status) EOF test_cmp expect actual ' @@ -33,25 +33,25 @@ test_expect_success "setup proc-receive hook (option refname, $PROTOCOL)" ' write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/pull/123/head" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A) test_expect_success "proc-receive: report option refname ($PROTOCOL)" ' git -C workbench push origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/pull/123/head remote: # post-receive hook remote: post-receive< refs/pull/123/head @@ -65,25 +65,25 @@ test_expect_success "setup proc-receive hook (option refname and forced-update, write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/pull/123/head" \ -r "option forced-update" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A) test_expect_success "proc-receive: report option refname and forced-update ($PROTOCOL)" ' git -C workbench push origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/pull/123/head remote: proc-receive> option forced-update remote: # post-receive hook @@ -98,26 +98,26 @@ test_expect_success "setup proc-receive hook (option refname and old-oid, $PROTO write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/pull/123/head" \ -r "option old-oid $B" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A) test_expect_success "proc-receive: report option refname and old-oid ($PROTOCOL)" ' git -C workbench push origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/pull/123/head remote: proc-receive> option old-oid remote: # post-receive hook @@ -132,30 +132,30 @@ test_expect_success "setup proc-receive hook (option old-oid, $PROTOCOL)" ' write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option old-oid $B" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A) test_expect_success "proc-receive: report option old-oid ($PROTOCOL)" ' git -C workbench push origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option old-oid remote: # post-receive hook - remote: post-receive< refs/for/master/topic + remote: post-receive< refs/for/main/topic To - .. HEAD -> refs/for/master/topic + .. HEAD -> refs/for/main/topic EOF test_cmp expect actual ' @@ -164,32 +164,32 @@ test_expect_success "setup proc-receive hook (option old-oid and new-oid, $PROTO write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option old-oid $A" \ -r "option new-oid $B" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A) test_expect_success "proc-receive: report option old-oid and new-oid ($PROTOCOL)" ' git -C workbench push origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option old-oid remote: proc-receive> option new-oid remote: # post-receive hook - remote: post-receive< refs/for/master/topic + remote: post-receive< refs/for/main/topic To - .. HEAD -> refs/for/master/topic + .. HEAD -> refs/for/main/topic EOF test_cmp expect actual ' @@ -201,7 +201,7 @@ test_expect_success "setup proc-receive hook (report with multiple rewrites, $PR -r "ok refs/for/a/b/c/topic" \ -r "ok refs/for/next/topic" \ -r "option refname refs/pull/123/head" \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/pull/124/head" \ -r "option old-oid $B" \ -r "option forced-update" \ @@ -209,29 +209,29 @@ test_expect_success "setup proc-receive hook (report with multiple rewrites, $PR EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A) test_expect_success "proc-receive: report with multiple rewrites ($PROTOCOL)" ' git -C workbench push origin \ HEAD:refs/for/next/topic \ HEAD:refs/for/a/b/c/topic \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/for/next/topic remote: pre-receive< refs/for/a/b/c/topic - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook remote: proc-receive< refs/for/next/topic remote: proc-receive< refs/for/a/b/c/topic - remote: proc-receive< refs/for/master/topic + remote: proc-receive< refs/for/main/topic remote: proc-receive> ok refs/for/a/b/c/topic remote: proc-receive> ok refs/for/next/topic remote: proc-receive> option refname refs/pull/123/head - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/pull/124/head remote: proc-receive> option old-oid remote: proc-receive> option forced-update @@ -250,7 +250,7 @@ test_expect_success "proc-receive: report with multiple rewrites ($PROTOCOL)" ' git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' diff --git a/t/t5411/test-0033-report-with-options--porcelain.sh b/t/t5411/test-0033-report-with-options--porcelain.sh index 1fe352b686..32ae26bcfb 100644 --- a/t/t5411/test-0033-report-with-options--porcelain.sh +++ b/t/t5411/test-0033-report-with-options--porcelain.sh @@ -7,24 +7,24 @@ test_expect_success "setup proc-receive hook (option without matching ok, $PROTO EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A) test_expect_success "proc-receive: report option without matching ok ($PROTOCOL/porcelain)" ' test_must_fail git -C workbench push --porcelain origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic + remote: proc-receive< refs/for/main/topic remote: proc-receive> option refname refs/pull/123/head remote: proc-receive> option old-oid remote: error: proc-receive reported "option" without a matching "ok/ng" directive To - ! HEAD:refs/for/master/topic [remote rejected] (proc-receive failed to report status) + ! HEAD:refs/for/main/topic [remote rejected] (proc-receive failed to report status) Done EOF test_cmp expect actual @@ -34,25 +34,25 @@ test_expect_success "setup proc-receive hook (option refname, $PROTOCOL/porcelai write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/pull/123/head" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A) test_expect_success "proc-receive: report option refname ($PROTOCOL/porcelain)" ' git -C workbench push --porcelain origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/pull/123/head remote: # post-receive hook remote: post-receive< refs/pull/123/head @@ -67,26 +67,26 @@ test_expect_success "setup proc-receive hook (option refname and forced-update, write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/pull/123/head" \ -r "option forced-update" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A) test_expect_success "proc-receive: report option refname and forced-update ($PROTOCOL/porcelain)" ' git -C workbench push --porcelain origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/pull/123/head remote: proc-receive> option forced-update remote: # post-receive hook @@ -102,26 +102,26 @@ test_expect_success "setup proc-receive hook (option refname and old-oid, $PROTO write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/pull/123/head" \ -r "option old-oid $B" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A) test_expect_success "proc-receive: report option refname and old-oid ($PROTOCOL/porcelain)" ' git -C workbench push --porcelain origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/pull/123/head remote: proc-receive> option old-oid remote: # post-receive hook @@ -137,30 +137,30 @@ test_expect_success "setup proc-receive hook (option old-oid, $PROTOCOL/porcelai write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option old-oid $B" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A) test_expect_success "proc-receive: report option old-oid ($PROTOCOL/porcelain)" ' git -C workbench push --porcelain origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option old-oid remote: # post-receive hook - remote: post-receive< refs/for/master/topic + remote: post-receive< refs/for/main/topic To - HEAD:refs/for/master/topic .. + HEAD:refs/for/main/topic .. Done EOF test_cmp expect actual @@ -170,32 +170,32 @@ test_expect_success "setup proc-receive hook (option old-oid and new-oid, $PROTO write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option old-oid $A" \ -r "option new-oid $B" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A) test_expect_success "proc-receive: report option old-oid and new-oid ($PROTOCOL/porcelain)" ' git -C workbench push --porcelain origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option old-oid remote: proc-receive> option new-oid remote: # post-receive hook - remote: post-receive< refs/for/master/topic + remote: post-receive< refs/for/main/topic To - HEAD:refs/for/master/topic .. + HEAD:refs/for/main/topic .. Done EOF test_cmp expect actual @@ -208,7 +208,7 @@ test_expect_success "setup proc-receive hook (report with multiple rewrites, $PR -r "ok refs/for/a/b/c/topic" \ -r "ok refs/for/next/topic" \ -r "option refname refs/pull/123/head" \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/pull/124/head" \ -r "option old-oid $B" \ -r "option forced-update" \ @@ -217,29 +217,29 @@ test_expect_success "setup proc-receive hook (report with multiple rewrites, $PR EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A) test_expect_success "proc-receive: report with multiple rewrites ($PROTOCOL/porcelain)" ' git -C workbench push --porcelain origin \ HEAD:refs/for/next/topic \ HEAD:refs/for/a/b/c/topic \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/for/next/topic remote: pre-receive< refs/for/a/b/c/topic - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook remote: proc-receive< refs/for/next/topic remote: proc-receive< refs/for/a/b/c/topic - remote: proc-receive< refs/for/master/topic + remote: proc-receive< refs/for/main/topic remote: proc-receive> ok refs/for/a/b/c/topic remote: proc-receive> ok refs/for/next/topic remote: proc-receive> option refname refs/pull/123/head - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/pull/124/head remote: proc-receive> option old-oid remote: proc-receive> option forced-update @@ -259,7 +259,7 @@ test_expect_success "proc-receive: report with multiple rewrites ($PROTOCOL/porc git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' diff --git a/t/t5411/test-0034-report-ft.sh b/t/t5411/test-0034-report-ft.sh index aca2b0676c..c355c290d2 100644 --- a/t/t5411/test-0034-report-ft.sh +++ b/t/t5411/test-0034-report-ft.sh @@ -2,43 +2,43 @@ test_expect_success "setup proc-receive hook (ft, $PROTOCOL)" ' write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option fall-through" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic(B) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic(B) test_expect_success "proc-receive: fall throught, let receive-pack to execute ($PROTOCOL)" ' git -C workbench push origin \ - $B:refs/for/master/topic \ + $B:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option fall-through remote: # post-receive hook - remote: post-receive< refs/for/master/topic + remote: post-receive< refs/for/main/topic To - * [new reference] -> refs/for/master/topic + * [new reference] -> refs/for/main/topic EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/for/master/topic - refs/heads/master + refs/for/main/topic + refs/heads/main EOF test_cmp expect actual ' -# Refs of upstream : master(A) refs/for/master/topic(A) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(A) refs/for/main/topic(A) +# Refs of workbench: main(A) tags/v123 test_expect_success "cleanup ($PROTOCOL)" ' - git -C "$upstream" update-ref -d refs/for/master/topic + git -C "$upstream" update-ref -d refs/for/main/topic ' diff --git a/t/t5411/test-0035-report-ft--porcelain.sh b/t/t5411/test-0035-report-ft--porcelain.sh index 30ffffb352..8ce4e58f2a 100644 --- a/t/t5411/test-0035-report-ft--porcelain.sh +++ b/t/t5411/test-0035-report-ft--porcelain.sh @@ -2,44 +2,44 @@ test_expect_success "setup proc-receive hook (fall-through, $PROTOCOL/porcelain) write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option fall-through" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic(B) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic(B) test_expect_success "proc-receive: fall throught, let receive-pack to execute ($PROTOCOL/porcelain)" ' git -C workbench push --porcelain origin \ - $B:refs/for/master/topic \ + $B:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option fall-through remote: # post-receive hook - remote: post-receive< refs/for/master/topic + remote: post-receive< refs/for/main/topic To - * :refs/for/master/topic [new reference] + * :refs/for/main/topic [new reference] Done EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/for/master/topic - refs/heads/master + refs/for/main/topic + refs/heads/main EOF test_cmp expect actual ' -# Refs of upstream : master(A) refs/for/master/topic(A) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(A) refs/for/main/topic(A) +# Refs of workbench: main(A) tags/v123 test_expect_success "cleanup ($PROTOCOL/porcelain)" ' - git -C "$upstream" update-ref -d refs/for/master/topic + git -C "$upstream" update-ref -d refs/for/main/topic ' diff --git a/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh b/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh index 73283d81e8..fad8eea8a0 100644 --- a/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh +++ b/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh @@ -17,50 +17,50 @@ test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option old-oid $A" \ -r "option new-oid $B" \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/changes/24/124/1" \ -r "option old-oid $ZERO_OID" \ -r "option new-oid $A" \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/changes/25/125/1" \ -r "option old-oid $A" \ -r "option new-oid $B" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic(A) test_expect_success "proc-receive: multiple rewrite for one ref, no refname for the 1st rewrite ($PROTOCOL)" ' git -C workbench push origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option old-oid remote: proc-receive> option new-oid - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/changes/24/124/1 remote: proc-receive> option old-oid remote: proc-receive> option new-oid - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/changes/25/125/1 remote: proc-receive> option old-oid remote: proc-receive> option new-oid remote: # post-receive hook - remote: post-receive< refs/for/master/topic + remote: post-receive< refs/for/main/topic remote: post-receive< refs/changes/24/124/1 remote: post-receive< refs/changes/25/125/1 To - .. HEAD -> refs/for/master/topic + .. HEAD -> refs/for/main/topic * [new reference] HEAD -> refs/changes/24/124/1 .. HEAD -> refs/changes/25/125/1 EOF @@ -68,7 +68,7 @@ test_expect_success "proc-receive: multiple rewrite for one ref, no refname for git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' @@ -80,10 +80,10 @@ test_expect_success "proc-receive: check remote-tracking #1 ($PROTOCOL)" ' cat >expect <<-EOF && refs/t/changes/24/124/1 refs/t/changes/25/125/1 - refs/t/for/master/topic + refs/t/for/main/topic EOF test_cmp expect actual && - git -C workbench update-ref -d refs/t/for/master/topic && + git -C workbench update-ref -d refs/t/for/main/topic && git -C workbench update-ref -d refs/t/changes/24/124/1 && git -C workbench update-ref -d refs/t/changes/25/125/1 ' @@ -92,14 +92,14 @@ test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/changes/24/124/1" \ -r "option old-oid $ZERO_OID" \ -r "option new-oid $A" \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option old-oid $A" \ -r "option new-oid $B" \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/changes/25/125/1" \ -r "option old-oid $B" \ -r "option new-oid $A" \ @@ -107,45 +107,45 @@ test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic(A) test_expect_success "proc-receive: multiple rewrites for one ref, no refname for the 2nd rewrite ($PROTOCOL)" ' git -C workbench push origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/changes/24/124/1 remote: proc-receive> option old-oid remote: proc-receive> option new-oid - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option old-oid remote: proc-receive> option new-oid - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/changes/25/125/1 remote: proc-receive> option old-oid remote: proc-receive> option new-oid remote: proc-receive> option forced-update remote: # post-receive hook remote: post-receive< refs/changes/24/124/1 - remote: post-receive< refs/for/master/topic + remote: post-receive< refs/for/main/topic remote: post-receive< refs/changes/25/125/1 To * [new reference] HEAD -> refs/changes/24/124/1 - .. HEAD -> refs/for/master/topic + .. HEAD -> refs/for/main/topic + ... HEAD -> refs/changes/25/125/1 (forced update) EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' @@ -157,10 +157,10 @@ test_expect_success "proc-receive: check remote-tracking #2 ($PROTOCOL)" ' cat >expect <<-EOF && refs/t/changes/24/124/1 refs/t/changes/25/125/1 - refs/t/for/master/topic + refs/t/for/main/topic EOF test_cmp expect actual && - git -C workbench update-ref -d refs/t/for/master/topic && + git -C workbench update-ref -d refs/t/for/main/topic && git -C workbench update-ref -d refs/t/changes/24/124/1 && git -C workbench update-ref -d refs/t/changes/25/125/1 ' @@ -169,31 +169,31 @@ test_expect_success "setup proc-receive hook (multiple rewrites for one ref, $PR write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/changes/23/123/1" \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/changes/24/124/2" \ -r "option old-oid $A" \ -r "option new-oid $B" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic(A) test_expect_success "proc-receive: multiple rewrites for one ref ($PROTOCOL)" ' git -C workbench push origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/changes/23/123/1 - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/changes/24/124/2 remote: proc-receive> option old-oid remote: proc-receive> option new-oid @@ -208,7 +208,7 @@ test_expect_success "proc-receive: multiple rewrites for one ref ($PROTOCOL)" ' git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' diff --git a/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh b/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh index 77b5b22ed4..dc254d57eb 100644 --- a/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh +++ b/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh @@ -2,50 +2,50 @@ test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option old-oid $A" \ -r "option new-oid $B" \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/changes/24/124/1" \ -r "option old-oid $ZERO_OID" \ -r "option new-oid $A" \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/changes/25/125/1" \ -r "option old-oid $A" \ -r "option new-oid $B" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic(A) test_expect_success "proc-receive: multiple rewrite for one ref, no refname for the 1st rewrite ($PROTOCOL/porcelain)" ' git -C workbench push --porcelain origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option old-oid remote: proc-receive> option new-oid - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/changes/24/124/1 remote: proc-receive> option old-oid remote: proc-receive> option new-oid - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/changes/25/125/1 remote: proc-receive> option old-oid remote: proc-receive> option new-oid remote: # post-receive hook - remote: post-receive< refs/for/master/topic + remote: post-receive< refs/for/main/topic remote: post-receive< refs/changes/24/124/1 remote: post-receive< refs/changes/25/125/1 To - HEAD:refs/for/master/topic .. + HEAD:refs/for/main/topic .. * HEAD:refs/changes/24/124/1 [new reference] HEAD:refs/changes/25/125/1 .. Done @@ -54,7 +54,7 @@ test_expect_success "proc-receive: multiple rewrite for one ref, no refname for git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' @@ -63,14 +63,14 @@ test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/changes/24/124/1" \ -r "option old-oid $ZERO_OID" \ -r "option new-oid $A" \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option old-oid $A" \ -r "option new-oid $B" \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/changes/25/125/1" \ -r "option old-oid $B" \ -r "option new-oid $A" \ @@ -78,38 +78,38 @@ test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic(A) test_expect_success "proc-receive: multiple rewrites for one ref, no refname for the 2nd rewrite ($PROTOCOL/porcelain)" ' git -C workbench push --porcelain origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/changes/24/124/1 remote: proc-receive> option old-oid remote: proc-receive> option new-oid - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option old-oid remote: proc-receive> option new-oid - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/changes/25/125/1 remote: proc-receive> option old-oid remote: proc-receive> option new-oid remote: proc-receive> option forced-update remote: # post-receive hook remote: post-receive< refs/changes/24/124/1 - remote: post-receive< refs/for/master/topic + remote: post-receive< refs/for/main/topic remote: post-receive< refs/changes/25/125/1 To * HEAD:refs/changes/24/124/1 [new reference] - HEAD:refs/for/master/topic .. + HEAD:refs/for/main/topic .. + HEAD:refs/changes/25/125/1 ... (forced update) Done EOF @@ -117,7 +117,7 @@ test_expect_success "proc-receive: multiple rewrites for one ref, no refname for git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' @@ -126,31 +126,31 @@ test_expect_success "setup proc-receive hook (multiple rewrites for one ref, $PR write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/changes/23/123/1" \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/changes/24/124/2" \ -r "option old-oid $A" \ -r "option new-oid $B" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic(A) test_expect_success "proc-receive: multiple rewrites for one ref ($PROTOCOL/porcelain)" ' git -C workbench push --porcelain origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/changes/23/123/1 - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/changes/24/124/2 remote: proc-receive> option old-oid remote: proc-receive> option new-oid @@ -166,7 +166,7 @@ test_expect_success "proc-receive: multiple rewrites for one ref ($PROTOCOL/porc git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' diff --git a/t/t5411/test-0038-report-mixed-refs.sh b/t/t5411/test-0038-report-mixed-refs.sh index a74a2cb449..0d071ebaa6 100644 --- a/t/t5411/test-0038-report-mixed-refs.sh +++ b/t/t5411/test-0038-report-mixed-refs.sh @@ -4,63 +4,63 @@ test_expect_success "setup proc-receive hook ($PROTOCOL)" ' test-tool proc-receive -v \ -r "ok refs/for/next/topic2" \ -r "ng refs/for/next/topic1 fail to call Web API" \ - -r "ok refs/for/master/topic" \ - -r "option refname refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ + -r "option refname refs/for/main/topic" \ -r "option old-oid $A" \ -r "option new-oid $B" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : (B) bar(A) baz(A) refs/for/next/topic(A) foo(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : (B) bar(A) baz(A) refs/for/next/topic(A) foo(A) refs/for/main/topic(A) test_expect_success "proc-receive: report update of mixed refs ($PROTOCOL)" ' test_must_fail git -C workbench push origin \ - $B:refs/heads/master \ + $B:refs/heads/main \ HEAD:refs/heads/bar \ HEAD:refs/heads/baz \ HEAD:refs/for/next/topic2 \ HEAD:refs/for/next/topic1 \ HEAD:refs/heads/foo \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ HEAD:refs/for/next/topic3 \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/heads/master + remote: pre-receive< refs/heads/main remote: pre-receive< refs/heads/bar remote: pre-receive< refs/heads/baz remote: pre-receive< refs/for/next/topic2 remote: pre-receive< refs/for/next/topic1 remote: pre-receive< refs/heads/foo - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: pre-receive< refs/for/next/topic3 remote: # proc-receive hook remote: proc-receive< refs/for/next/topic2 remote: proc-receive< refs/for/next/topic1 - remote: proc-receive< refs/for/master/topic + remote: proc-receive< refs/for/main/topic remote: proc-receive< refs/for/next/topic3 remote: proc-receive> ok refs/for/next/topic2 remote: proc-receive> ng refs/for/next/topic1 fail to call Web API - remote: proc-receive> ok refs/for/master/topic - remote: proc-receive> option refname refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic + remote: proc-receive> option refname refs/for/main/topic remote: proc-receive> option old-oid remote: proc-receive> option new-oid remote: # post-receive hook - remote: post-receive< refs/heads/master + remote: post-receive< refs/heads/main remote: post-receive< refs/heads/bar remote: post-receive< refs/heads/baz remote: post-receive< refs/for/next/topic2 remote: post-receive< refs/heads/foo - remote: post-receive< refs/for/master/topic + remote: post-receive< refs/for/main/topic To - .. -> master + .. -> main * [new branch] HEAD -> bar * [new branch] HEAD -> baz * [new reference] HEAD -> refs/for/next/topic2 * [new branch] HEAD -> foo - .. HEAD -> refs/for/master/topic + .. HEAD -> refs/for/main/topic ! [remote rejected] HEAD -> refs/for/next/topic1 (fail to call Web API) ! [remote rejected] HEAD -> refs/for/next/topic3 (proc-receive failed to report status) EOF @@ -71,17 +71,17 @@ test_expect_success "proc-receive: report update of mixed refs ($PROTOCOL)" ' refs/heads/bar refs/heads/baz refs/heads/foo - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' -# Refs of upstream : master(B) foo(A) bar(A)) baz(A) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(B) foo(A) bar(A)) baz(A) +# Refs of workbench: main(A) tags/v123 test_expect_success "cleanup ($PROTOCOL)" ' ( cd "$upstream" && - git update-ref refs/heads/master $A && + git update-ref refs/heads/main $A && git update-ref -d refs/heads/foo && git update-ref -d refs/heads/bar && git update-ref -d refs/heads/baz diff --git a/t/t5411/test-0039-report-mixed-refs--porcelain.sh b/t/t5411/test-0039-report-mixed-refs--porcelain.sh index e4baa13ea3..d8409912fd 100644 --- a/t/t5411/test-0039-report-mixed-refs--porcelain.sh +++ b/t/t5411/test-0039-report-mixed-refs--porcelain.sh @@ -4,63 +4,63 @@ test_expect_success "setup proc-receive hook ($PROTOCOL/porcelain)" ' test-tool proc-receive -v \ -r "ok refs/for/next/topic2" \ -r "ng refs/for/next/topic1 fail to call Web API" \ - -r "ok refs/for/master/topic" \ - -r "option refname refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ + -r "option refname refs/for/main/topic" \ -r "option old-oid $A" \ -r "option new-oid $B" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : (B) bar(A) baz(A) refs/for/next/topic(A) foo(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : (B) bar(A) baz(A) refs/for/next/topic(A) foo(A) refs/for/main/topic(A) test_expect_success "proc-receive: report update of mixed refs ($PROTOCOL/porcelain)" ' test_must_fail git -C workbench push --porcelain origin \ - $B:refs/heads/master \ + $B:refs/heads/main \ HEAD:refs/heads/bar \ HEAD:refs/heads/baz \ HEAD:refs/for/next/topic2 \ HEAD:refs/for/next/topic1 \ HEAD:refs/heads/foo \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ HEAD:refs/for/next/topic3 \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/heads/master + remote: pre-receive< refs/heads/main remote: pre-receive< refs/heads/bar remote: pre-receive< refs/heads/baz remote: pre-receive< refs/for/next/topic2 remote: pre-receive< refs/for/next/topic1 remote: pre-receive< refs/heads/foo - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: pre-receive< refs/for/next/topic3 remote: # proc-receive hook remote: proc-receive< refs/for/next/topic2 remote: proc-receive< refs/for/next/topic1 - remote: proc-receive< refs/for/master/topic + remote: proc-receive< refs/for/main/topic remote: proc-receive< refs/for/next/topic3 remote: proc-receive> ok refs/for/next/topic2 remote: proc-receive> ng refs/for/next/topic1 fail to call Web API - remote: proc-receive> ok refs/for/master/topic - remote: proc-receive> option refname refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic + remote: proc-receive> option refname refs/for/main/topic remote: proc-receive> option old-oid remote: proc-receive> option new-oid remote: # post-receive hook - remote: post-receive< refs/heads/master + remote: post-receive< refs/heads/main remote: post-receive< refs/heads/bar remote: post-receive< refs/heads/baz remote: post-receive< refs/for/next/topic2 remote: post-receive< refs/heads/foo - remote: post-receive< refs/for/master/topic + remote: post-receive< refs/for/main/topic To - :refs/heads/master .. + :refs/heads/main .. * HEAD:refs/heads/bar [new branch] * HEAD:refs/heads/baz [new branch] * HEAD:refs/for/next/topic2 [new reference] * HEAD:refs/heads/foo [new branch] - HEAD:refs/for/master/topic .. + HEAD:refs/for/main/topic .. ! HEAD:refs/for/next/topic1 [remote rejected] (fail to call Web API) ! HEAD:refs/for/next/topic3 [remote rejected] (proc-receive failed to report status) Done @@ -72,17 +72,17 @@ test_expect_success "proc-receive: report update of mixed refs ($PROTOCOL/porcel refs/heads/bar refs/heads/baz refs/heads/foo - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' -# Refs of upstream : master(B) foo(A) bar(A)) baz(A) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(B) foo(A) bar(A)) baz(A) +# Refs of workbench: main(A) tags/v123 test_expect_success "cleanup ($PROTOCOL/porcelain)" ' ( cd "$upstream" && - git update-ref refs/heads/master $A && + git update-ref refs/heads/main $A && git update-ref -d refs/heads/foo && git update-ref -d refs/heads/bar && git update-ref -d refs/heads/baz diff --git a/t/t5411/test-0040-process-all-refs.sh b/t/t5411/test-0040-process-all-refs.sh index b07c999f53..2565302a17 100644 --- a/t/t5411/test-0040-process-all-refs.sh +++ b/t/t5411/test-0040-process-all-refs.sh @@ -3,12 +3,12 @@ test_expect_success "config receive.procReceiveRefs = refs ($PROTOCOL)" ' git -C "$upstream" config --add receive.procReceiveRefs refs ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 test_expect_success "setup upstream branches ($PROTOCOL)" ' ( cd "$upstream" && - git update-ref refs/heads/master $B && + git update-ref refs/heads/main $B && git update-ref refs/heads/foo $A && git update-ref refs/heads/bar $A && git update-ref refs/heads/baz $A @@ -20,13 +20,13 @@ test_expect_success "setup proc-receive hook ($PROTOCOL)" ' write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/heads/master" \ + -r "ok refs/heads/main" \ -r "option fall-through" \ -r "ok refs/heads/foo" \ -r "option fall-through" \ -r "ok refs/heads/bar" \ -r "option fall-through" \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/pull/123/head" \ -r "option old-oid $A" \ -r "option new-oid $B" \ @@ -38,15 +38,15 @@ test_expect_success "setup proc-receive hook ($PROTOCOL)" ' EOF ' -# Refs of upstream : master(B) foo(A) bar(A)) baz(A) -# Refs of workbench: master(A) tags/v123 -# git push -f : master(A) (NULL) (B) refs/for/master/topic(A) refs/for/next/topic(A) +# Refs of upstream : main(B) foo(A) bar(A)) baz(A) +# Refs of workbench: main(A) tags/v123 +# git push -f : main(A) (NULL) (B) refs/for/main/topic(A) refs/for/next/topic(A) test_expect_success "proc-receive: process all refs ($PROTOCOL)" ' git -C workbench push -f origin \ - HEAD:refs/heads/master \ + HEAD:refs/heads/main \ :refs/heads/foo \ $B:refs/heads/bar \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ HEAD:refs/for/next/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && @@ -54,22 +54,22 @@ test_expect_success "proc-receive: process all refs ($PROTOCOL)" ' remote: # pre-receive hook remote: pre-receive< refs/heads/bar remote: pre-receive< refs/heads/foo - remote: pre-receive< refs/heads/master - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/heads/main + remote: pre-receive< refs/for/main/topic remote: pre-receive< refs/for/next/topic remote: # proc-receive hook remote: proc-receive< refs/heads/bar remote: proc-receive< refs/heads/foo - remote: proc-receive< refs/heads/master - remote: proc-receive< refs/for/master/topic + remote: proc-receive< refs/heads/main + remote: proc-receive< refs/for/main/topic remote: proc-receive< refs/for/next/topic - remote: proc-receive> ok refs/heads/master + remote: proc-receive> ok refs/heads/main remote: proc-receive> option fall-through remote: proc-receive> ok refs/heads/foo remote: proc-receive> option fall-through remote: proc-receive> ok refs/heads/bar remote: proc-receive> option fall-through - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/pull/123/head remote: proc-receive> option old-oid remote: proc-receive> option new-oid @@ -81,13 +81,13 @@ test_expect_success "proc-receive: process all refs ($PROTOCOL)" ' remote: # post-receive hook remote: post-receive< refs/heads/bar remote: post-receive< refs/heads/foo - remote: post-receive< refs/heads/master + remote: post-receive< refs/heads/main remote: post-receive< refs/pull/123/head remote: post-receive< refs/pull/124/head To .. -> bar - [deleted] foo - + ... HEAD -> master (forced update) + + ... HEAD -> main (forced update) .. HEAD -> refs/pull/123/head + ... HEAD -> refs/pull/124/head (forced update) EOF @@ -97,13 +97,13 @@ test_expect_success "proc-receive: process all refs ($PROTOCOL)" ' cat >expect <<-EOF && refs/heads/bar refs/heads/baz - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' -# Refs of upstream : master(A) bar(A) baz(B) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(A) bar(A) baz(B) +# Refs of workbench: main(A) tags/v123 test_expect_success "cleanup ($PROTOCOL)" ' ( cd "$upstream" && diff --git a/t/t5411/test-0041-process-all-refs--porcelain.sh b/t/t5411/test-0041-process-all-refs--porcelain.sh index 0dd9824616..e21420b60d 100644 --- a/t/t5411/test-0041-process-all-refs--porcelain.sh +++ b/t/t5411/test-0041-process-all-refs--porcelain.sh @@ -3,12 +3,12 @@ test_expect_success "config receive.procReceiveRefs = refs ($PROTOCOL/porcelain) git -C "$upstream" config --add receive.procReceiveRefs refs ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 test_expect_success "setup upstream branches ($PROTOCOL/porcelain)" ' ( cd "$upstream" && - git update-ref refs/heads/master $B && + git update-ref refs/heads/main $B && git update-ref refs/heads/foo $A && git update-ref refs/heads/bar $A && git update-ref refs/heads/baz $A @@ -20,13 +20,13 @@ test_expect_success "setup proc-receive hook ($PROTOCOL/porcelain)" ' write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/heads/master" \ + -r "ok refs/heads/main" \ -r "option fall-through" \ -r "ok refs/heads/foo" \ -r "option fall-through" \ -r "ok refs/heads/bar" \ -r "option fall-through" \ - -r "ok refs/for/master/topic" \ + -r "ok refs/for/main/topic" \ -r "option refname refs/pull/123/head" \ -r "option old-oid $A" \ -r "option new-oid $B" \ @@ -38,15 +38,15 @@ test_expect_success "setup proc-receive hook ($PROTOCOL/porcelain)" ' EOF ' -# Refs of upstream : master(B) foo(A) bar(A)) baz(A) -# Refs of workbench: master(A) tags/v123 -# git push -f : master(A) (NULL) (B) refs/for/master/topic(A) refs/for/next/topic(A) +# Refs of upstream : main(B) foo(A) bar(A)) baz(A) +# Refs of workbench: main(A) tags/v123 +# git push -f : main(A) (NULL) (B) refs/for/main/topic(A) refs/for/next/topic(A) test_expect_success "proc-receive: process all refs ($PROTOCOL/porcelain)" ' git -C workbench push --porcelain -f origin \ - HEAD:refs/heads/master \ + HEAD:refs/heads/main \ :refs/heads/foo \ $B:refs/heads/bar \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ HEAD:refs/for/next/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && @@ -54,22 +54,22 @@ test_expect_success "proc-receive: process all refs ($PROTOCOL/porcelain)" ' remote: # pre-receive hook remote: pre-receive< refs/heads/bar remote: pre-receive< refs/heads/foo - remote: pre-receive< refs/heads/master - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/heads/main + remote: pre-receive< refs/for/main/topic remote: pre-receive< refs/for/next/topic remote: # proc-receive hook remote: proc-receive< refs/heads/bar remote: proc-receive< refs/heads/foo - remote: proc-receive< refs/heads/master - remote: proc-receive< refs/for/master/topic + remote: proc-receive< refs/heads/main + remote: proc-receive< refs/for/main/topic remote: proc-receive< refs/for/next/topic - remote: proc-receive> ok refs/heads/master + remote: proc-receive> ok refs/heads/main remote: proc-receive> option fall-through remote: proc-receive> ok refs/heads/foo remote: proc-receive> option fall-through remote: proc-receive> ok refs/heads/bar remote: proc-receive> option fall-through - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic remote: proc-receive> option refname refs/pull/123/head remote: proc-receive> option old-oid remote: proc-receive> option new-oid @@ -81,13 +81,13 @@ test_expect_success "proc-receive: process all refs ($PROTOCOL/porcelain)" ' remote: # post-receive hook remote: post-receive< refs/heads/bar remote: post-receive< refs/heads/foo - remote: post-receive< refs/heads/master + remote: post-receive< refs/heads/main remote: post-receive< refs/pull/123/head remote: post-receive< refs/pull/124/head To :refs/heads/bar .. - :refs/heads/foo [deleted] - + HEAD:refs/heads/master ... (forced update) + + HEAD:refs/heads/main ... (forced update) HEAD:refs/pull/123/head .. + HEAD:refs/pull/124/head ... (forced update) Done @@ -98,13 +98,13 @@ test_expect_success "proc-receive: process all refs ($PROTOCOL/porcelain)" ' cat >expect <<-EOF && refs/heads/bar refs/heads/baz - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' -# Refs of upstream : master(A) bar(A) baz(B) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(A) bar(A) baz(B) +# Refs of workbench: main(A) tags/v123 test_expect_success "cleanup ($PROTOCOL/porcelain)" ' ( cd "$upstream" && diff --git a/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh b/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh index c22849cbe2..2e29518ec5 100644 --- a/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh +++ b/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh @@ -2,7 +2,7 @@ test_expect_success "config receive.procReceiveRefs with modifiers ($PROTOCOL)" ( cd "$upstream" && git config --unset-all receive.procReceiveRefs && - git config --add receive.procReceiveRefs m:refs/heads/master && + git config --add receive.procReceiveRefs m:refs/heads/main && git config --add receive.procReceiveRefs ad:refs/heads && git config --add receive.procReceiveRefs "a!:refs/heads" ) @@ -12,7 +12,7 @@ test_expect_success "setup proc-receive hook ($PROTOCOL)" ' write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/heads/master" \ + -r "ok refs/heads/main" \ -r "option refname refs/pull/123/head" \ -r "option old-oid $A" \ -r "option new-oid $B" \ @@ -21,22 +21,22 @@ test_expect_success "setup proc-receive hook ($PROTOCOL)" ' EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : master(B) tags/v123 +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : main(B) tags/v123 test_expect_success "proc-receive: update branch and new tag ($PROTOCOL)" ' git -C workbench push origin \ - $B:refs/heads/master \ + $B:refs/heads/main \ v123 >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/heads/master + remote: pre-receive< refs/heads/main remote: pre-receive< refs/tags/v123 remote: # proc-receive hook - remote: proc-receive< refs/heads/master + remote: proc-receive< refs/heads/main remote: proc-receive< refs/tags/v123 - remote: proc-receive> ok refs/heads/master + remote: proc-receive> ok refs/heads/main remote: proc-receive> option refname refs/pull/123/head remote: proc-receive> option old-oid remote: proc-receive> option new-oid @@ -53,20 +53,20 @@ test_expect_success "proc-receive: update branch and new tag ($PROTOCOL)" ' git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 test_expect_success "setup upstream: create tags/v123 ($PROTOCOL)" ' git -C "$upstream" update-ref refs/heads/topic $A && git -C "$upstream" update-ref refs/tags/v123 $TAG && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main refs/heads/topic refs/tags/v123 EOF @@ -77,7 +77,7 @@ test_expect_success "setup proc-receive hook ($PROTOCOL)" ' write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/heads/master" \ + -r "ok refs/heads/main" \ -r "option refname refs/pull/123/head" \ -r "option old-oid $A" \ -r "option new-oid $ZERO_OID" \ @@ -87,26 +87,26 @@ test_expect_success "setup proc-receive hook ($PROTOCOL)" ' EOF ' -# Refs of upstream : master(A) topic(A) tags/v123 -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(A) topic(A) tags/v123 +# Refs of workbench: main(A) tags/v123 # git push : NULL topic(B) NULL next(A) test_expect_success "proc-receive: create/delete branch, and delete tag ($PROTOCOL)" ' git -C workbench push origin \ - :refs/heads/master \ + :refs/heads/main \ $B:refs/heads/topic \ $A:refs/heads/next \ :refs/tags/v123 >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/heads/master + remote: pre-receive< refs/heads/main remote: pre-receive< refs/heads/topic remote: pre-receive< refs/tags/v123 remote: pre-receive< refs/heads/next remote: # proc-receive hook - remote: proc-receive< refs/heads/master + remote: proc-receive< refs/heads/main remote: proc-receive< refs/heads/next - remote: proc-receive> ok refs/heads/master + remote: proc-receive> ok refs/heads/main remote: proc-receive> option refname refs/pull/123/head remote: proc-receive> option old-oid remote: proc-receive> option new-oid @@ -128,7 +128,7 @@ test_expect_success "proc-receive: create/delete branch, and delete tag ($PROTOC git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main refs/heads/topic EOF test_cmp expect actual From patchwork Sat Oct 31 19:46:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain via GitGitGadget X-Patchwork-Id: 11871757 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 CA549C55179 for ; Sat, 31 Oct 2020 19:46:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 81C7220720 for ; Sat, 31 Oct 2020 19:46:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="puCaDqH3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728455AbgJaTqM (ORCPT ); Sat, 31 Oct 2020 15:46:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728432AbgJaTqM (ORCPT ); Sat, 31 Oct 2020 15:46:12 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54ABAC061A04 for ; Sat, 31 Oct 2020 12:46:10 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id m13so10067417wrj.7 for ; Sat, 31 Oct 2020 12:46:10 -0700 (PDT) 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=pIHCYNaGkPvxJ/2JTR6hP3IfIcrbzuXeRrLq/sVRBLs=; b=puCaDqH3jW5iEse7WF6D16YhPScBxfMIVzIdfSSBNe/IoQU3gyvbrM3Bf6gIgWch1T XkKOGlF5ca0s/WvdWfrrm6znxbmhKW5zAXzJGJiHZqi4PNurtXvsugDUH9s9TEDgmgxr Fum4VoAI53boxvQs4inxpjG9t7AdU+v/FWO+aac2gjPw1JS6bV1rzgaU/w/JiiBOiq+H lRKHptAF0wQcA1qEMIjG219sTc11Pva9YkSLKPjGTg22q5qvzaGsxzhfTf33RJahusxc Vam358aVGX1WCWCLrdAwMNresFLi37aCDbBCjqFxMf5iNsBkRrJsRJCBr0AzSGHkDeAC Gs6w== 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=pIHCYNaGkPvxJ/2JTR6hP3IfIcrbzuXeRrLq/sVRBLs=; b=i0GC5pvWmghTrLMm2wK31cHSTTq66nSqj4i/jfCe46+Ld891EeTKAI1OsYEOMEkOGH +uUp7h3EAIHTlrdkUXiRYRNO1yBZcHB57nVv4f7foyvR7Vaht00UUM0ruJ7aZPuFvISr 1J5Flz2FBJxKGgX3QFPgKsl+5jLjAkAzwxE21WWCd0P+J77CKS3KeR+kt+vycazZDHQo moi0z61KH7ewphNlOZKU5XUAZjj9BPzUYR1z+WdnwkwpGNuFpj/nK+WjvB8zX0N1xW+d fiZvsebk7dkRLHc/As59q5gIDUJahyR4S05NcrecInjm+4gz7gQxb7LAkIYeALecFc+/ 7dQw== X-Gm-Message-State: AOAM533NHMv793uyF1bww3kqWIDzeRwgTJcXfREd7EarhKA91mBS2joT VoNgsDyaHq0bG3flsYnIuYOGK6PxWu4= X-Google-Smtp-Source: ABdhPJyZsIOKxx0S+/e78kN5bD2BLytIwkh7AtBwuH5unAv+bJ048vtF7WdhBI//N+CFZ/yzkAybSA== X-Received: by 2002:a5d:66c9:: with SMTP id k9mr11873231wrw.158.1604173567834; Sat, 31 Oct 2020 12:46:07 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u3sm19768479wme.0.2020.10.31.12.46.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Oct 2020 12:46:07 -0700 (PDT) Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Date: Sat, 31 Oct 2020 19:46:02 +0000 Subject: [PATCH v2 3/4] t5411: adjust the remaining support files for init.defaultBranch=main Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin This trick was performed via $ sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t/t5411/* In the previous commit, we adjusted roughly half of the support files, to stay under the 100kB limit (mails larger than that are rejected by the Git mailing list). Signed-off-by: Johannes Schindelin --- t/t5411/common-functions.sh | 2 +- t/t5411/once-0010-report-status-v1.sh | 50 +++++----- t/t5411/test-0000-standard-git-push.sh | 72 +++++++------- .../test-0001-standard-git-push--porcelain.sh | 72 +++++++------- t/t5411/test-0002-pre-receive-declined.sh | 12 +-- ...st-0003-pre-receive-declined--porcelain.sh | 12 +-- t/t5411/test-0011-no-hook-error.sh | 38 ++++---- t/t5411/test-0012-no-hook-error--porcelain.sh | 38 ++++---- t/t5411/test-0013-bad-protocol.sh | 96 +++++++++---------- t/t5411/test-0014-bad-protocol--porcelain.sh | 70 +++++++------- t/t5411/test-0020-report-ng.sh | 40 ++++---- t/t5411/test-0021-report-ng--porcelain.sh | 40 ++++---- t/t5411/test-0022-report-unexpect-ref.sh | 36 +++---- ...est-0023-report-unexpect-ref--porcelain.sh | 36 +++---- t/t5411/test-0024-report-unknown-ref.sh | 12 +-- ...test-0025-report-unknown-ref--porcelain.sh | 12 +-- t/t5411/test-0026-push-options.sh | 36 +++---- t/t5411/test-0027-push-options--porcelain.sh | 36 +++---- 18 files changed, 355 insertions(+), 355 deletions(-) diff --git a/t/t5411/common-functions.sh b/t/t5411/common-functions.sh index 6580bebd8e..521a347710 100644 --- a/t/t5411/common-functions.sh +++ b/t/t5411/common-functions.sh @@ -28,7 +28,7 @@ create_commits_in () { shift || return 1 done && - git -C "$repo" update-ref refs/heads/master $oid + git -C "$repo" update-ref refs/heads/main $oid } # Format the output of git-push, git-show-ref and other commands to make a diff --git a/t/t5411/once-0010-report-status-v1.sh b/t/t5411/once-0010-report-status-v1.sh index dc2cf4a522..6005ee0ecb 100644 --- a/t/t5411/once-0010-report-status-v1.sh +++ b/t/t5411/once-0010-report-status-v1.sh @@ -6,12 +6,12 @@ test_expect_success "setup proc-receive hook" ' write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic1" \ + -r "ok refs/for/main/topic1" \ -r "option fall-through" \ - -r "ok refs/for/master/topic2" \ + -r "ok refs/for/main/topic2" \ -r "option refname refs/for/changes/23/123/1" \ -r "option new-oid $A" \ - -r "ok refs/for/master/topic2" \ + -r "ok refs/for/main/topic2" \ -r "option refname refs/for/changes/24/124/2" \ -r "option old-oid $B" \ -r "option new-oid $A" \ @@ -20,26 +20,26 @@ test_expect_success "setup proc-receive hook" ' EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : (B) refs/for/master/topic1(A) foo(A) refs/for/next/topic(A) refs/for/master/topic2(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : (B) refs/for/main/topic1(A) foo(A) refs/for/next/topic(A) refs/for/main/topic2(A) test_expect_success "proc-receive: report status v1" ' { if test -z "$GIT_DEFAULT_HASH" || test "$GIT_DEFAULT_HASH" = "sha1" then - printf "%s %s refs/heads/master\0report-status\n" \ + printf "%s %s refs/heads/main\0report-status\n" \ $A $B | packetize else - printf "%s %s refs/heads/master\0report-status object-format=$GIT_DEFAULT_HASH\n" \ + printf "%s %s refs/heads/main\0report-status object-format=$GIT_DEFAULT_HASH\n" \ $A $B | packetize fi && - printf "%s %s refs/for/master/topic1\n" \ + printf "%s %s refs/for/main/topic1\n" \ $ZERO_OID $A | packetize && printf "%s %s refs/heads/foo\n" \ $ZERO_OID $A | packetize && printf "%s %s refs/for/next/topic\n" \ $ZERO_OID $A | packetize && - printf "%s %s refs/for/master/topic2\n" \ + printf "%s %s refs/for/main/topic2\n" \ $ZERO_OID $A | packetize && printf 0000 && printf "" | git -C "$upstream" pack-objects --stdout @@ -48,35 +48,35 @@ test_expect_success "proc-receive: report status v1" ' make_user_friendly_and_stable_output actual && cat >expect <<-EOF && # pre-receive hook - pre-receive< refs/heads/master - pre-receive< refs/for/master/topic1 + pre-receive< refs/heads/main + pre-receive< refs/for/main/topic1 pre-receive< refs/heads/foo pre-receive< refs/for/next/topic - pre-receive< refs/for/master/topic2 + pre-receive< refs/for/main/topic2 # proc-receive hook - proc-receive< refs/for/master/topic1 + proc-receive< refs/for/main/topic1 proc-receive< refs/for/next/topic - proc-receive< refs/for/master/topic2 - proc-receive> ok refs/for/master/topic1 + proc-receive< refs/for/main/topic2 + proc-receive> ok refs/for/main/topic1 proc-receive> option fall-through - proc-receive> ok refs/for/master/topic2 + proc-receive> ok refs/for/main/topic2 proc-receive> option refname refs/for/changes/23/123/1 proc-receive> option new-oid - proc-receive> ok refs/for/master/topic2 + proc-receive> ok refs/for/main/topic2 proc-receive> option refname refs/for/changes/24/124/2 proc-receive> option old-oid proc-receive> option new-oid proc-receive> option forced-update proc-receive> ng refs/for/next/topic target branch not exist 000eunpack ok - 0019ok refs/heads/master - 001eok refs/for/master/topic1 + 0019ok refs/heads/main + 001eok refs/for/main/topic1 0016ok refs/heads/foo 0033ng refs/for/next/topic target branch not exist - 001eok refs/for/master/topic2 + 001eok refs/for/main/topic2 0000# post-receive hook - post-receive< refs/heads/master - post-receive< refs/for/master/topic1 + post-receive< refs/heads/main + post-receive< refs/for/main/topic1 post-receive< refs/heads/foo post-receive< refs/for/changes/23/123/1 post-receive< refs/for/changes/24/124/2 @@ -86,9 +86,9 @@ test_expect_success "proc-receive: report status v1" ' git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/for/master/topic1 + refs/for/main/topic1 refs/heads/foo - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' diff --git a/t/t5411/test-0000-standard-git-push.sh b/t/t5411/test-0000-standard-git-push.sh index e206587348..2b04b49367 100644 --- a/t/t5411/test-0000-standard-git-push.sh +++ b/t/t5411/test-0000-standard-git-push.sh @@ -1,39 +1,39 @@ -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git-push : master(B) next(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git-push : main(B) next(A) test_expect_success "git-push ($PROTOCOL)" ' git -C workbench push origin \ - $B:refs/heads/master \ + $B:refs/heads/main \ HEAD:refs/heads/next \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/heads/master + remote: pre-receive< refs/heads/main remote: pre-receive< refs/heads/next remote: # post-receive hook - remote: post-receive< refs/heads/master + remote: post-receive< refs/heads/main remote: post-receive< refs/heads/next To - .. -> master + .. -> main * [new branch] HEAD -> next EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main refs/heads/next EOF test_cmp expect actual ' -# Refs of upstream : master(B) next(A) -# Refs of workbench: master(A) tags/v123 -# git-push --atomic: master(A) next(B) +# Refs of upstream : main(B) next(A) +# Refs of workbench: main(A) tags/v123 +# git-push --atomic: main(A) next(B) test_expect_success "git-push --atomic ($PROTOCOL)" ' test_must_fail git -C workbench push --atomic origin \ - master \ + main \ $B:refs/heads/next \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && To - ! [rejected] master -> master (non-fast-forward) + ! [rejected] main -> main (non-fast-forward) ! [rejected] -> next (atomic push failed) EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main refs/heads/next EOF test_cmp expect actual ' -# Refs of upstream : master(B) next(A) -# Refs of workbench: master(A) tags/v123 -# git-push : master(A) next(B) +# Refs of upstream : main(B) next(A) +# Refs of workbench: main(A) tags/v123 +# git-push : main(A) next(B) test_expect_success "non-fast-forward git-push ($PROTOCOL)" ' test_must_fail git \ -C workbench \ -c advice.pushUpdateRejected=false \ push origin \ - master \ + main \ $B:refs/heads/next \ >out 2>&1 && make_user_friendly_and_stable_output actual && @@ -75,48 +75,48 @@ test_expect_success "non-fast-forward git-push ($PROTOCOL)" ' remote: post-receive< refs/heads/next To .. -> next - ! [rejected] master -> master (non-fast-forward) + ! [rejected] main -> main (non-fast-forward) EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main refs/heads/next EOF test_cmp expect actual ' -# Refs of upstream : master(B) next(B) -# Refs of workbench: master(A) tags/v123 -# git-push -f : master(A) NULL tags/v123 refs/review/master/topic(A) a/b/c(A) +# Refs of upstream : main(B) next(B) +# Refs of workbench: main(A) tags/v123 +# git-push -f : main(A) NULL tags/v123 refs/review/main/topic(A) a/b/c(A) test_expect_success "git-push -f ($PROTOCOL)" ' git -C workbench push -f origin \ refs/tags/v123 \ :refs/heads/next \ - master \ - master:refs/review/master/topic \ + main \ + main:refs/review/main/topic \ HEAD:refs/heads/a/b/c \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/heads/master + remote: pre-receive< refs/heads/main remote: pre-receive< refs/heads/next remote: pre-receive< refs/tags/v123 - remote: pre-receive< refs/review/master/topic + remote: pre-receive< refs/review/main/topic remote: pre-receive< refs/heads/a/b/c remote: # post-receive hook - remote: post-receive< refs/heads/master + remote: post-receive< refs/heads/main remote: post-receive< refs/heads/next remote: post-receive< refs/tags/v123 - remote: post-receive< refs/review/master/topic + remote: post-receive< refs/review/main/topic remote: post-receive< refs/heads/a/b/c To - + ... master -> master (forced update) + + ... main -> main (forced update) - [deleted] next * [new tag] v123 -> v123 - * [new reference] master -> refs/review/master/topic + * [new reference] main -> refs/review/main/topic * [new branch] HEAD -> a/b/c EOF test_cmp expect actual && @@ -124,19 +124,19 @@ test_expect_success "git-push -f ($PROTOCOL)" ' make_user_friendly_and_stable_output actual && cat >expect <<-EOF && refs/heads/a/b/c - refs/heads/master - refs/review/master/topic + refs/heads/main + refs/review/main/topic refs/tags/v123 EOF test_cmp expect actual ' -# Refs of upstream : master(A) tags/v123 refs/review/master/topic(A) a/b/c(A) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(A) tags/v123 refs/review/main/topic(A) a/b/c(A) +# Refs of workbench: main(A) tags/v123 test_expect_success "cleanup ($PROTOCOL)" ' ( cd "$upstream" && - git update-ref -d refs/review/master/topic && + git update-ref -d refs/review/main/topic && git update-ref -d refs/tags/v123 && git update-ref -d refs/heads/a/b/c ) diff --git a/t/t5411/test-0001-standard-git-push--porcelain.sh b/t/t5411/test-0001-standard-git-push--porcelain.sh index 48f6fcc846..747307f8da 100644 --- a/t/t5411/test-0001-standard-git-push--porcelain.sh +++ b/t/t5411/test-0001-standard-git-push--porcelain.sh @@ -1,21 +1,21 @@ -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git-push : master(B) next(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git-push : main(B) next(A) test_expect_success "git-push ($PROTOCOL/porcelain)" ' git -C workbench push --porcelain origin \ - $B:refs/heads/master \ + $B:refs/heads/main \ HEAD:refs/heads/next \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/heads/master + remote: pre-receive< refs/heads/main remote: pre-receive< refs/heads/next remote: # post-receive hook - remote: post-receive< refs/heads/master + remote: post-receive< refs/heads/main remote: post-receive< refs/heads/next To - :refs/heads/master .. + :refs/heads/main .. * HEAD:refs/heads/next [new branch] Done EOF @@ -23,18 +23,18 @@ test_expect_success "git-push ($PROTOCOL/porcelain)" ' git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main refs/heads/next EOF test_cmp expect actual ' -# Refs of upstream : master(B) next(A) -# Refs of workbench: master(A) tags/v123 -# git-push --atomic: master(A) next(B) +# Refs of upstream : main(B) next(A) +# Refs of workbench: main(A) tags/v123 +# git-push --atomic: main(A) next(B) test_expect_success "git-push --atomic ($PROTOCOL/porcelain)" ' test_must_fail git -C workbench push --atomic --porcelain origin \ - master \ + main \ $B:refs/heads/next \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && To - ! refs/heads/master:refs/heads/master [rejected] (non-fast-forward) + ! refs/heads/main:refs/heads/main [rejected] (non-fast-forward) ! :refs/heads/next [rejected] (atomic push failed) EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main refs/heads/next EOF test_cmp expect actual ' -# Refs of upstream : master(B) next(A) -# Refs of workbench: master(A) tags/v123 -# git-push : master(A) next(B) +# Refs of upstream : main(B) next(A) +# Refs of workbench: main(A) tags/v123 +# git-push : main(A) next(B) test_expect_success "non-fast-forward git-push ($PROTOCOL/porcelain)" ' test_must_fail git \ -C workbench \ -c advice.pushUpdateRejected=false \ push --porcelain origin \ - master \ + main \ $B:refs/heads/next \ >out 2>&1 && make_user_friendly_and_stable_output actual && @@ -77,49 +77,49 @@ test_expect_success "non-fast-forward git-push ($PROTOCOL/porcelain)" ' remote: post-receive< refs/heads/next To :refs/heads/next .. - ! refs/heads/master:refs/heads/master [rejected] (non-fast-forward) + ! refs/heads/main:refs/heads/main [rejected] (non-fast-forward) Done EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main refs/heads/next EOF test_cmp expect actual ' -# Refs of upstream : master(B) next(B) -# Refs of workbench: master(A) tags/v123 -# git-push -f : master(A) NULL tags/v123 refs/review/master/topic(A) a/b/c(A) +# Refs of upstream : main(B) next(B) +# Refs of workbench: main(A) tags/v123 +# git-push -f : main(A) NULL tags/v123 refs/review/main/topic(A) a/b/c(A) test_expect_success "git-push -f ($PROTOCOL/porcelain)" ' git -C workbench push --porcelain -f origin \ refs/tags/v123 \ :refs/heads/next \ - master \ - master:refs/review/master/topic \ + main \ + main:refs/review/main/topic \ HEAD:refs/heads/a/b/c \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/heads/master + remote: pre-receive< refs/heads/main remote: pre-receive< refs/heads/next remote: pre-receive< refs/tags/v123 - remote: pre-receive< refs/review/master/topic + remote: pre-receive< refs/review/main/topic remote: pre-receive< refs/heads/a/b/c remote: # post-receive hook - remote: post-receive< refs/heads/master + remote: post-receive< refs/heads/main remote: post-receive< refs/heads/next remote: post-receive< refs/tags/v123 - remote: post-receive< refs/review/master/topic + remote: post-receive< refs/review/main/topic remote: post-receive< refs/heads/a/b/c To - + refs/heads/master:refs/heads/master ... (forced update) + + refs/heads/main:refs/heads/main ... (forced update) - :refs/heads/next [deleted] * refs/tags/v123:refs/tags/v123 [new tag] - * refs/heads/master:refs/review/master/topic [new reference] + * refs/heads/main:refs/review/main/topic [new reference] * HEAD:refs/heads/a/b/c [new branch] Done EOF @@ -128,19 +128,19 @@ test_expect_success "git-push -f ($PROTOCOL/porcelain)" ' make_user_friendly_and_stable_output actual && cat >expect <<-EOF && refs/heads/a/b/c - refs/heads/master - refs/review/master/topic + refs/heads/main + refs/review/main/topic refs/tags/v123 EOF test_cmp expect actual ' -# Refs of upstream : master(A) tags/v123 refs/review/master/topic(A) a/b/c(A) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(A) tags/v123 refs/review/main/topic(A) a/b/c(A) +# Refs of workbench: main(A) tags/v123 test_expect_success "cleanup ($PROTOCOL/porcelain)" ' ( cd "$upstream" && - git update-ref -d refs/review/master/topic && + git update-ref -d refs/review/main/topic && git update-ref -d refs/tags/v123 && git update-ref -d refs/heads/a/b/c ) diff --git a/t/t5411/test-0002-pre-receive-declined.sh b/t/t5411/test-0002-pre-receive-declined.sh index c246f7e68e..e7d113a158 100644 --- a/t/t5411/test-0002-pre-receive-declined.sh +++ b/t/t5411/test-0002-pre-receive-declined.sh @@ -5,25 +5,25 @@ test_expect_success "setup pre-receive hook ($PROTOCOL)" ' EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git-push : master(B) next(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git-push : main(B) next(A) test_expect_success "git-push is declined ($PROTOCOL)" ' test_must_fail git -C workbench push origin \ - $B:refs/heads/master \ + $B:refs/heads/main \ HEAD:refs/heads/next \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && To - ! [remote rejected] -> master (pre-receive hook declined) + ! [remote rejected] -> main (pre-receive hook declined) ! [remote rejected] HEAD -> next (pre-receive hook declined) EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' diff --git a/t/t5411/test-0003-pre-receive-declined--porcelain.sh b/t/t5411/test-0003-pre-receive-declined--porcelain.sh index b14894de81..cc0cca6a47 100644 --- a/t/t5411/test-0003-pre-receive-declined--porcelain.sh +++ b/t/t5411/test-0003-pre-receive-declined--porcelain.sh @@ -5,18 +5,18 @@ test_expect_success "setup pre-receive hook ($PROTOCOL/porcelain)" ' EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git-push : master(B) next(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git-push : main(B) next(A) test_expect_success "git-push is declined ($PROTOCOL/porcelain)" ' test_must_fail git -C workbench push --porcelain origin \ - $B:refs/heads/master \ + $B:refs/heads/main \ HEAD:refs/heads/next \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && To - ! :refs/heads/master [remote rejected] (pre-receive hook declined) + ! :refs/heads/main [remote rejected] (pre-receive hook declined) ! HEAD:refs/heads/next [remote rejected] (pre-receive hook declined) Done EOF @@ -24,7 +24,7 @@ test_expect_success "git-push is declined ($PROTOCOL/porcelain)" ' git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' diff --git a/t/t5411/test-0011-no-hook-error.sh b/t/t5411/test-0011-no-hook-error.sh index bb6ec92a92..c50830982f 100644 --- a/t/t5411/test-0011-no-hook-error.sh +++ b/t/t5411/test-0011-no-hook-error.sh @@ -1,64 +1,64 @@ -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : next(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : next(A) refs/for/main/topic(A) test_expect_success "proc-receive: no hook, fail to push special ref ($PROTOCOL)" ' test_must_fail git -C workbench push origin \ HEAD:next \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/heads/next - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: error: cannot find hook "proc-receive" remote: # post-receive hook remote: post-receive< refs/heads/next To * [new branch] HEAD -> next - ! [remote rejected] HEAD -> refs/for/master/topic (fail to run proc-receive hook) + ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook) EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main refs/heads/next EOF test_cmp expect actual ' -# Refs of upstream : master(A) next(A) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(A) next(A) +# Refs of workbench: main(A) tags/v123 test_expect_success "cleanup ($PROTOCOL)" ' git -C "$upstream" update-ref -d refs/heads/next ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push --atomic: (B) next(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push --atomic: (B) next(A) refs/for/main/topic(A) test_expect_success "proc-receive: no hook, all failed for atomic push ($PROTOCOL)" ' test_must_fail git -C workbench push --atomic origin \ - $B:master \ + $B:main \ HEAD:next \ - HEAD:refs/for/master/topic >out 2>&1 && + HEAD:refs/for/main/topic >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/heads/master + remote: pre-receive< refs/heads/main remote: pre-receive< refs/heads/next - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: error: cannot find hook "proc-receive" To - ! [remote rejected] -> master (fail to run proc-receive hook) + ! [remote rejected] -> main (fail to run proc-receive hook) ! [remote rejected] HEAD -> next (fail to run proc-receive hook) - ! [remote rejected] HEAD -> refs/for/master/topic (fail to run proc-receive hook) + ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook) EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' diff --git a/t/t5411/test-0012-no-hook-error--porcelain.sh b/t/t5411/test-0012-no-hook-error--porcelain.sh index 4814f74dc2..14ea433481 100644 --- a/t/t5411/test-0012-no-hook-error--porcelain.sh +++ b/t/t5411/test-0012-no-hook-error--porcelain.sh @@ -1,66 +1,66 @@ -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : next(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : next(A) refs/for/main/topic(A) test_expect_success "proc-receive: no hook, fail to push special ref ($PROTOCOL/porcelain)" ' test_must_fail git -C workbench push --porcelain origin \ HEAD:next \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/heads/next - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: error: cannot find hook "proc-receive" remote: # post-receive hook remote: post-receive< refs/heads/next To * HEAD:refs/heads/next [new branch] - ! HEAD:refs/for/master/topic [remote rejected] (fail to run proc-receive hook) + ! HEAD:refs/for/main/topic [remote rejected] (fail to run proc-receive hook) Done EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main refs/heads/next EOF test_cmp expect actual ' -# Refs of upstream : master(A) next(A) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(A) next(A) +# Refs of workbench: main(A) tags/v123 test_expect_success "cleanup ($PROTOCOL/porcelain)" ' git -C "$upstream" update-ref -d refs/heads/next ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push --atomic: (B) next(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push --atomic: (B) next(A) refs/for/main/topic(A) test_expect_success "proc-receive: no hook, all failed for atomic push ($PROTOCOL/porcelain)" ' test_must_fail git -C workbench push --porcelain --atomic origin \ - $B:master \ + $B:main \ HEAD:next \ - HEAD:refs/for/master/topic >out 2>&1 && + HEAD:refs/for/main/topic >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/heads/master + remote: pre-receive< refs/heads/main remote: pre-receive< refs/heads/next - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: error: cannot find hook "proc-receive" To - ! :refs/heads/master [remote rejected] (fail to run proc-receive hook) + ! :refs/heads/main [remote rejected] (fail to run proc-receive hook) ! HEAD:refs/heads/next [remote rejected] (fail to run proc-receive hook) - ! HEAD:refs/for/master/topic [remote rejected] (fail to run proc-receive hook) + ! HEAD:refs/for/main/topic [remote rejected] (fail to run proc-receive hook) Done EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' diff --git a/t/t5411/test-0013-bad-protocol.sh b/t/t5411/test-0013-bad-protocol.sh index c5fe4cb37b..854c3e884a 100644 --- a/t/t5411/test-0013-bad-protocol.sh +++ b/t/t5411/test-0013-bad-protocol.sh @@ -5,12 +5,12 @@ test_expect_success "setup proc-receive hook (unknown version, $PROTOCOL)" ' EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic(A) test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL)" ' test_must_fail git -C workbench push origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && @@ -20,7 +20,7 @@ test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL)" ' actual-report && cat >expect <<-EOF && To - ! [remote rejected] HEAD -> refs/for/master/topic (fail to run proc-receive hook) + ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook) EOF test_cmp expect actual-report && @@ -36,7 +36,7 @@ test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL)" ' git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' @@ -48,30 +48,30 @@ test_expect_success "setup proc-receive hook (hook --die-version, $PROTOCOL)" ' EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic(A) test_expect_success "proc-receive: bad protocol (hook --die-version, $PROTOCOL)" ' test_must_fail git -C workbench push origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook remote: fatal: bad protocol version: 1 remote: error: proc-receive version "0" is not supported To - ! [remote rejected] HEAD -> refs/for/master/topic (fail to run proc-receive hook) + ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook) EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' @@ -83,21 +83,21 @@ test_expect_success "setup proc-receive hook (hook --die-readline, $PROTOCOL)" ' EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic(A) test_expect_success "proc-receive: bad protocol (hook --die-readline, $PROTOCOL)" ' test_must_fail git -C workbench push origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && - grep "remote: fatal: protocol error: expected \"old new ref\", got \" refs/for/master/topic\"" actual && + grep "remote: fatal: protocol error: expected \"old new ref\", got \" refs/for/main/topic\"" actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' @@ -109,38 +109,38 @@ test_expect_success "setup proc-receive hook (no report, $PROTOCOL)" ' EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : next(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : next(A) refs/for/main/topic(A) test_expect_success "proc-receive: bad protocol (no report, $PROTOCOL)" ' test_must_fail git -C workbench push origin \ HEAD:refs/heads/next \ - HEAD:refs/for/master/topic >out 2>&1 && + HEAD:refs/for/main/topic >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/heads/next - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic + remote: proc-receive< refs/for/main/topic remote: # post-receive hook remote: post-receive< refs/heads/next To * [new branch] HEAD -> next - ! [remote rejected] HEAD -> refs/for/master/topic (proc-receive failed to report status) + ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status) EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main refs/heads/next EOF test_cmp expect actual ' -# Refs of upstream : master(A) next(A) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(A) next(A) +# Refs of workbench: main(A) tags/v123 test_expect_success "cleanup ($PROTOCOL)" ' git -C "$upstream" update-ref -d refs/heads/next @@ -154,29 +154,29 @@ test_expect_success "setup proc-receive hook (no ref, $PROTOCOL)" ' EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL)" ' test_must_fail git -C workbench push origin \ - HEAD:refs/for/master/topic\ + HEAD:refs/for/main/topic\ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic + remote: proc-receive< refs/for/main/topic remote: proc-receive> ok remote: error: proc-receive reported incomplete status line: "ok" To - ! [remote rejected] HEAD -> refs/for/master/topic (proc-receive failed to report status) + ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status) EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' @@ -185,33 +185,33 @@ test_expect_success "setup proc-receive hook (unknown status, $PROTOCOL)" ' write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "xx refs/for/master/topic" + -r "xx refs/for/main/topic" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL)" ' test_must_fail git -C workbench push origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> xx refs/for/master/topic - remote: error: proc-receive reported bad status "xx" on ref "refs/for/master/topic" + remote: proc-receive< refs/for/main/topic + remote: proc-receive> xx refs/for/main/topic + remote: error: proc-receive reported bad status "xx" on ref "refs/for/main/topic" To - ! [remote rejected] HEAD -> refs/for/master/topic (proc-receive failed to report status) + ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status) EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' diff --git a/t/t5411/test-0014-bad-protocol--porcelain.sh b/t/t5411/test-0014-bad-protocol--porcelain.sh index 53b47b0185..88c56311da 100644 --- a/t/t5411/test-0014-bad-protocol--porcelain.sh +++ b/t/t5411/test-0014-bad-protocol--porcelain.sh @@ -5,12 +5,12 @@ test_expect_success "setup proc-receive hook (unknown version, $PROTOCOL/porcela EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic(A) test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL/porcelain)" ' test_must_fail git -C workbench push --porcelain origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && @@ -20,7 +20,7 @@ test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL/porc actual-report && cat >expect <<-EOF && To - ! HEAD:refs/for/master/topic [remote rejected] (fail to run proc-receive hook) + ! HEAD:refs/for/main/topic [remote rejected] (fail to run proc-receive hook) Done EOF test_cmp expect actual-report && @@ -37,7 +37,7 @@ test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL/porc git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' @@ -49,39 +49,39 @@ test_expect_success "setup proc-receive hook (no report, $PROTOCOL/porcelain)" ' EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : next(A) refs/for/master/topic(A) +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : next(A) refs/for/main/topic(A) test_expect_success "proc-receive: bad protocol (no report, $PROTOCOL/porcelain)" ' test_must_fail git -C workbench push --porcelain origin \ HEAD:refs/heads/next \ - HEAD:refs/for/master/topic >out 2>&1 && + HEAD:refs/for/main/topic >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/heads/next - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic + remote: proc-receive< refs/for/main/topic remote: # post-receive hook remote: post-receive< refs/heads/next To * HEAD:refs/heads/next [new branch] - ! HEAD:refs/for/master/topic [remote rejected] (proc-receive failed to report status) + ! HEAD:refs/for/main/topic [remote rejected] (proc-receive failed to report status) Done EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main refs/heads/next EOF test_cmp expect actual ' -# Refs of upstream : master(A) next(A) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(A) next(A) +# Refs of workbench: main(A) tags/v123 test_expect_success "cleanup ($PROTOCOL/porcelain)" ' git -C "$upstream" update-ref -d refs/heads/next @@ -95,30 +95,30 @@ test_expect_success "setup proc-receive hook (no ref, $PROTOCOL/porcelain)" ' EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL/porcelain)" ' test_must_fail git -C workbench push --porcelain origin \ - HEAD:refs/for/master/topic\ + HEAD:refs/for/main/topic\ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic + remote: proc-receive< refs/for/main/topic remote: proc-receive> ok remote: error: proc-receive reported incomplete status line: "ok" To - ! HEAD:refs/for/master/topic [remote rejected] (proc-receive failed to report status) + ! HEAD:refs/for/main/topic [remote rejected] (proc-receive failed to report status) Done EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' @@ -127,34 +127,34 @@ test_expect_success "setup proc-receive hook (unknown status, $PROTOCOL/porcelai write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "xx refs/for/master/topic" + -r "xx refs/for/main/topic" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL/porcelain)" ' test_must_fail git -C workbench push --porcelain origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> xx refs/for/master/topic - remote: error: proc-receive reported bad status "xx" on ref "refs/for/master/topic" + remote: proc-receive< refs/for/main/topic + remote: proc-receive> xx refs/for/main/topic + remote: error: proc-receive reported bad status "xx" on ref "refs/for/main/topic" To - ! HEAD:refs/for/master/topic [remote rejected] (proc-receive failed to report status) + ! HEAD:refs/for/main/topic [remote rejected] (proc-receive failed to report status) Done EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' diff --git a/t/t5411/test-0020-report-ng.sh b/t/t5411/test-0020-report-ng.sh index f726b7ca9c..5a9e0daf2d 100644 --- a/t/t5411/test-0020-report-ng.sh +++ b/t/t5411/test-0020-report-ng.sh @@ -2,32 +2,32 @@ test_expect_success "setup proc-receive hook (ng, no message, $PROTOCOL)" ' write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ng refs/for/master/topic" + -r "ng refs/for/main/topic" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL)" ' test_must_fail git -C workbench push origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ng refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ng refs/for/main/topic To - ! [remote rejected] HEAD -> refs/for/master/topic (failed) + ! [remote rejected] HEAD -> refs/for/main/topic (failed) EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' @@ -36,32 +36,32 @@ test_expect_success "setup proc-receive hook (ng message, $PROTOCOL)" ' write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ng refs/for/master/topic error msg" + -r "ng refs/for/main/topic error msg" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic test_expect_success "proc-receive: fail to update (ng, with message, $PROTOCOL)" ' test_must_fail git -C workbench push origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ng refs/for/master/topic error msg + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ng refs/for/main/topic error msg To - ! [remote rejected] HEAD -> refs/for/master/topic (error msg) + ! [remote rejected] HEAD -> refs/for/main/topic (error msg) EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' diff --git a/t/t5411/test-0021-report-ng--porcelain.sh b/t/t5411/test-0021-report-ng--porcelain.sh index fbf5569103..93475a83cf 100644 --- a/t/t5411/test-0021-report-ng--porcelain.sh +++ b/t/t5411/test-0021-report-ng--porcelain.sh @@ -2,33 +2,33 @@ test_expect_success "setup proc-receive hook (ng, no message, $PROTOCOL/porcelai write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ng refs/for/master/topic" + -r "ng refs/for/main/topic" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL/porcelain)" ' test_must_fail git -C workbench push --porcelain origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ng refs/for/master/topic + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ng refs/for/main/topic To - ! HEAD:refs/for/master/topic [remote rejected] (failed) + ! HEAD:refs/for/main/topic [remote rejected] (failed) Done EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' @@ -37,33 +37,33 @@ test_expect_success "setup proc-receive hook (ng message, $PROTOCOL/porcelain)" write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ng refs/for/master/topic error msg" + -r "ng refs/for/main/topic error msg" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : refs/for/main/topic test_expect_success "proc-receive: fail to update (ng, with message, $PROTOCOL/porcelain)" ' test_must_fail git -C workbench push --porcelain origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ng refs/for/master/topic error msg + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ng refs/for/main/topic error msg To - ! HEAD:refs/for/master/topic [remote rejected] (error msg) + ! HEAD:refs/for/main/topic [remote rejected] (error msg) Done EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' diff --git a/t/t5411/test-0022-report-unexpect-ref.sh b/t/t5411/test-0022-report-unexpect-ref.sh index 92a415b929..f8be8a0ba1 100644 --- a/t/t5411/test-0022-report-unexpect-ref.sh +++ b/t/t5411/test-0022-report-unexpect-ref.sh @@ -2,44 +2,44 @@ test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL)" ' write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/heads/master" + -r "ok refs/heads/main" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : (B) refs/for/master/topic +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : (B) refs/for/main/topic test_expect_success "proc-receive: report unexpected ref ($PROTOCOL)" ' test_must_fail git -C workbench push origin \ - $B:refs/heads/master \ - HEAD:refs/for/master/topic \ + $B:refs/heads/main \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/heads/master - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/heads/main + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/heads/master - remote: error: proc-receive reported status on unexpected ref: refs/heads/master + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/heads/main + remote: error: proc-receive reported status on unexpected ref: refs/heads/main remote: # post-receive hook - remote: post-receive< refs/heads/master + remote: post-receive< refs/heads/main To - .. -> master - ! [remote rejected] HEAD -> refs/for/master/topic (proc-receive failed to report status) + .. -> main + ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status) EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' -# Refs of upstream : master(B) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(B) +# Refs of workbench: main(A) tags/v123 test_expect_success "cleanup ($PROTOCOL)" ' - git -C "$upstream" update-ref refs/heads/master $A + git -C "$upstream" update-ref refs/heads/main $A ' diff --git a/t/t5411/test-0023-report-unexpect-ref--porcelain.sh b/t/t5411/test-0023-report-unexpect-ref--porcelain.sh index acbf93e40a..778150fa03 100644 --- a/t/t5411/test-0023-report-unexpect-ref--porcelain.sh +++ b/t/t5411/test-0023-report-unexpect-ref--porcelain.sh @@ -2,45 +2,45 @@ test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL/porcelai write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/heads/master" + -r "ok refs/heads/main" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : (B) refs/for/master/topic +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push : (B) refs/for/main/topic test_expect_success "proc-receive: report unexpected ref ($PROTOCOL/porcelain)" ' test_must_fail git -C workbench push --porcelain origin \ - $B:refs/heads/master \ - HEAD:refs/for/master/topic \ + $B:refs/heads/main \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook - remote: pre-receive< refs/heads/master - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/heads/main + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/heads/master - remote: error: proc-receive reported status on unexpected ref: refs/heads/master + remote: proc-receive< refs/for/main/topic + remote: proc-receive> ok refs/heads/main + remote: error: proc-receive reported status on unexpected ref: refs/heads/main remote: # post-receive hook - remote: post-receive< refs/heads/master + remote: post-receive< refs/heads/main To - :refs/heads/master .. - ! HEAD:refs/for/master/topic [remote rejected] (proc-receive failed to report status) + :refs/heads/main .. + ! HEAD:refs/for/main/topic [remote rejected] (proc-receive failed to report status) Done EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' -# Refs of upstream : master(B) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(B) +# Refs of workbench: main(A) tags/v123 test_expect_success "cleanup ($PROTOCOL/porcelain)" ' - git -C "$upstream" update-ref refs/heads/master $A + git -C "$upstream" update-ref refs/heads/main $A ' diff --git a/t/t5411/test-0024-report-unknown-ref.sh b/t/t5411/test-0024-report-unknown-ref.sh index c3946f329a..d4e74e4681 100644 --- a/t/t5411/test-0024-report-unknown-ref.sh +++ b/t/t5411/test-0024-report-unknown-ref.sh @@ -2,12 +2,12 @@ test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL)" ' write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" + -r "ok refs/for/main/topic" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 # git push : refs/for/a/b/c/my/topic test_expect_success "proc-receive: report unknown reference ($PROTOCOL)" ' test_must_fail git -C workbench push origin \ @@ -19,8 +19,8 @@ test_expect_success "proc-receive: report unknown reference ($PROTOCOL)" ' remote: pre-receive< refs/for/a/b/c/my/topic remote: # proc-receive hook remote: proc-receive< refs/for/a/b/c/my/topic - remote: proc-receive> ok refs/for/master/topic - remote: error: proc-receive reported status on unknown ref: refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic + remote: error: proc-receive reported status on unknown ref: refs/for/main/topic To ! [remote rejected] HEAD -> refs/for/a/b/c/my/topic (proc-receive failed to report status) EOF @@ -28,7 +28,7 @@ test_expect_success "proc-receive: report unknown reference ($PROTOCOL)" ' git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' diff --git a/t/t5411/test-0025-report-unknown-ref--porcelain.sh b/t/t5411/test-0025-report-unknown-ref--porcelain.sh index d093b1a579..039e8b6163 100644 --- a/t/t5411/test-0025-report-unknown-ref--porcelain.sh +++ b/t/t5411/test-0025-report-unknown-ref--porcelain.sh @@ -2,12 +2,12 @@ test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL/porcelai write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" + -r "ok refs/for/main/topic" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 # git push : refs/for/a/b/c/my/topic test_expect_success "proc-receive: report unknown reference ($PROTOCOL/porcelain)" ' test_must_fail git -C workbench push --porcelain origin \ @@ -19,8 +19,8 @@ test_expect_success "proc-receive: report unknown reference ($PROTOCOL/porcelain remote: pre-receive< refs/for/a/b/c/my/topic remote: # proc-receive hook remote: proc-receive< refs/for/a/b/c/my/topic - remote: proc-receive> ok refs/for/master/topic - remote: error: proc-receive reported status on unknown ref: refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic + remote: error: proc-receive reported status on unknown ref: refs/for/main/topic To ! HEAD:refs/for/a/b/c/my/topic [remote rejected] (proc-receive failed to report status) Done @@ -29,7 +29,7 @@ test_expect_success "proc-receive: report unknown reference ($PROTOCOL/porcelain git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' diff --git a/t/t5411/test-0026-push-options.sh b/t/t5411/test-0026-push-options.sh index d0c4da8b23..d414be87d0 100644 --- a/t/t5411/test-0026-push-options.sh +++ b/t/t5411/test-0026-push-options.sh @@ -3,19 +3,19 @@ test_expect_success "setup proc-receive hook and disable push-options ($PROTOCOL write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" + -r "ok refs/for/main/topic" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push -o ... : refs/for/master/topic +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push -o ... : refs/for/main/topic test_expect_success "proc-receive: not support push options ($PROTOCOL)" ' test_must_fail git -C workbench push \ -o issue=123 \ -o reviewer=user1 \ origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && test_i18ngrep "fatal: the receiving end does not support push options" \ @@ -23,7 +23,7 @@ test_expect_success "proc-receive: not support push options ($PROTOCOL)" ' git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' @@ -32,9 +32,9 @@ test_expect_success "enable push options ($PROTOCOL)" ' git -C "$upstream" config receive.advertisePushOptions true ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push -o ... : next(A) refs/for/master/topic +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push -o ... : next(A) refs/for/main/topic test_expect_success "proc-receive: push with options ($PROTOCOL)" ' git -C workbench push \ --atomic \ @@ -42,38 +42,38 @@ test_expect_success "proc-receive: push with options ($PROTOCOL)" ' -o reviewer=user1 \ origin \ HEAD:refs/heads/next \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/heads/next - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook remote: proc-receive: atomic push_options - remote: proc-receive< refs/for/master/topic + remote: proc-receive< refs/for/main/topic remote: proc-receive< issue=123 remote: proc-receive< reviewer=user1 - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic remote: # post-receive hook remote: post-receive< refs/heads/next - remote: post-receive< refs/for/master/topic + remote: post-receive< refs/for/main/topic To * [new branch] HEAD -> next - * [new reference] HEAD -> refs/for/master/topic + * [new reference] HEAD -> refs/for/main/topic EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main refs/heads/next EOF test_cmp expect actual ' -# Refs of upstream : master(A) next(A) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(A) next(A) +# Refs of workbench: main(A) tags/v123 test_expect_success "cleanup ($PROTOCOL)" ' git -C "$upstream" update-ref -d refs/heads/next ' diff --git a/t/t5411/test-0027-push-options--porcelain.sh b/t/t5411/test-0027-push-options--porcelain.sh index c89a1e7c57..d5d0dcb172 100644 --- a/t/t5411/test-0027-push-options--porcelain.sh +++ b/t/t5411/test-0027-push-options--porcelain.sh @@ -3,20 +3,20 @@ test_expect_success "setup proc-receive hook and disable push-options ($PROTOCOL write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" + -r "ok refs/for/main/topic" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push -o ... : refs/for/master/topic +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push -o ... : refs/for/main/topic test_expect_success "proc-receive: not support push options ($PROTOCOL/porcelain)" ' test_must_fail git -C workbench push \ --porcelain \ -o issue=123 \ -o reviewer=user1 \ origin \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && test_i18ngrep "fatal: the receiving end does not support push options" \ @@ -24,7 +24,7 @@ test_expect_success "proc-receive: not support push options ($PROTOCOL/porcelain git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main EOF test_cmp expect actual ' @@ -33,9 +33,9 @@ test_expect_success "enable push options ($PROTOCOL/porcelain)" ' git -C "$upstream" config receive.advertisePushOptions true ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push -o ... : next(A) refs/for/master/topic +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 +# git push -o ... : next(A) refs/for/main/topic test_expect_success "proc-receive: push with options ($PROTOCOL/porcelain)" ' git -C workbench push \ --porcelain \ @@ -44,39 +44,39 @@ test_expect_success "proc-receive: push with options ($PROTOCOL/porcelain)" ' -o reviewer=user1 \ origin \ HEAD:refs/heads/next \ - HEAD:refs/for/master/topic \ + HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/heads/next - remote: pre-receive< refs/for/master/topic + remote: pre-receive< refs/for/main/topic remote: # proc-receive hook remote: proc-receive: atomic push_options - remote: proc-receive< refs/for/master/topic + remote: proc-receive< refs/for/main/topic remote: proc-receive< issue=123 remote: proc-receive< reviewer=user1 - remote: proc-receive> ok refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic remote: # post-receive hook remote: post-receive< refs/heads/next - remote: post-receive< refs/for/master/topic + remote: post-receive< refs/for/main/topic To * HEAD:refs/heads/next [new branch] - * HEAD:refs/for/master/topic [new reference] + * HEAD:refs/for/main/topic [new reference] Done EOF test_cmp expect actual && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && cat >expect <<-EOF && - refs/heads/master + refs/heads/main refs/heads/next EOF test_cmp expect actual ' -# Refs of upstream : master(A) next(A) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(A) next(A) +# Refs of workbench: main(A) tags/v123 test_expect_success "cleanup ($PROTOCOL/porcelain)" ' git -C "$upstream" update-ref -d refs/heads/next ' From patchwork Sat Oct 31 19:46:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 11871753 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 5CDEEC388F7 for ; Sat, 31 Oct 2020 19:46:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 21CF8206F7 for ; Sat, 31 Oct 2020 19:46:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="S2vZV6qE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728442AbgJaTqK (ORCPT ); Sat, 31 Oct 2020 15:46:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725786AbgJaTqK (ORCPT ); Sat, 31 Oct 2020 15:46:10 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF263C0617A6 for ; Sat, 31 Oct 2020 12:46:09 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id d3so5823329wma.4 for ; Sat, 31 Oct 2020 12:46:09 -0700 (PDT) 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=9+JeKg8KCGC1nFbWiGvOgBcCPpUC/7LCbZeo9igdRqo=; b=S2vZV6qETTNhh3qjjtt+zBkNkpMhuOuBNPyyQeBCq5euBHlZm62Rlz4oK689pH/3/G vcUS9HiDlEXVEypCfcABlEHDuF8M1xgN/zWq22pnngGpXBpSsYK2Jydw8lNCZifCiCF1 PIGe0khMwDGhrTvBtxxXf89IqG/27kVqJpB6Tdbjjm20jUAFNrhrg6qS2r5u1gqb3mcN 6nuDqcUcOjRsYxGOWxn5YTr8mhT1WuX1o780s7xl08csItbO1SKzMDZVTgk16yhjD/Px KQp0yIK2qfSVHpNqxNF1gnV1KX533fmypmQorPUXQhGZMur9PZPkAAoCG1XXRYTGCtU4 TJ9A== 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=9+JeKg8KCGC1nFbWiGvOgBcCPpUC/7LCbZeo9igdRqo=; b=P/w0p6LDP8Cxwsk+VhXfNDrqebNgs4j3aqFICWxI23Dr0VwJRQX27A+hF6i6f0RmOZ BbwYB+WzUak7XM4NZcQ1gYNFEOjdSgJ8UgorbWOKL0SVnmHFa4qdXhKwmq5VdQdi00lp xpBswxPZbfo8vWWktmh3XGPWDyVQNYC6dRvKA22T74p42y25tJ/xSXowSeeg8B2JeQIF Rz/sTI7pod9kwX+aym+SoeP6fiDM3DZ5im7giFnr3BOx1sf952knpLbz98pVv7bSGxqV xLZA5+odJlHTX4+iPCvH0CcyJ5n0yOvGWTsUSv8tDyEZ8dETxYDbq+Z80vwpH4aFeY6u xQbg== X-Gm-Message-State: AOAM531k8PKCswmzHcU0HESFiEFz0lwntJ9X11FIPJ1+RnyjOPWA0iyx N8cDaRXfRNMEZkrtBmgIuxr8q/dNWiY= X-Google-Smtp-Source: ABdhPJwY3PFeyw7rVo1X3ofzUq6N2WIqXBw4o6HaxREsqboJceXCmTXpX2uQpq7X2LGOwiE7mPCc1Q== X-Received: by 2002:a1c:7213:: with SMTP id n19mr2022135wmc.36.1604173568486; Sat, 31 Oct 2020 12:46:08 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u10sm15015907wrw.36.2020.10.31.12.46.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Oct 2020 12:46:08 -0700 (PDT) Message-Id: <6f1f1a926460a836aa6fa169e67a3545c1451d6f.1604173564.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 31 Oct 2020 19:46:03 +0000 Subject: [PATCH v2 4/4] t5411: finish preparing for `main` being the default branch name Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin In addition to the trivial search-and-replace performed over the course of the previous three commits, there is one test in t5411 that depends on the length of the default branch name. Adjust it and use `main` as the default branch name in this test. Signed-off-by: Johannes Schindelin --- t/t5411-proc-receive-hook.sh | 7 +------ t/t5411/once-0010-report-status-v1.sh | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/t/t5411-proc-receive-hook.sh b/t/t5411-proc-receive-hook.sh index 6da6f597a5..98b0e81208 100755 --- a/t/t5411-proc-receive-hook.sh +++ b/t/t5411-proc-receive-hook.sh @@ -5,16 +5,11 @@ test_description='Test proc-receive hook' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh -test_have_prereq PREPARE_FOR_MAIN_BRANCH || { - test_skip="In transit for the default branch name 'main'" - test_done -} - . "$TEST_DIRECTORY"/t5411/common-functions.sh setup_upstream_and_workbench () { diff --git a/t/t5411/once-0010-report-status-v1.sh b/t/t5411/once-0010-report-status-v1.sh index 6005ee0ecb..cb431a9c91 100644 --- a/t/t5411/once-0010-report-status-v1.sh +++ b/t/t5411/once-0010-report-status-v1.sh @@ -69,11 +69,11 @@ test_expect_success "proc-receive: report status v1" ' proc-receive> option forced-update proc-receive> ng refs/for/next/topic target branch not exist 000eunpack ok - 0019ok refs/heads/main - 001eok refs/for/main/topic1 + 0017ok refs/heads/main + 001cok refs/for/main/topic1 0016ok refs/heads/foo 0033ng refs/for/next/topic target branch not exist - 001eok refs/for/main/topic2 + 001cok refs/for/main/topic2 0000# post-receive hook post-receive< refs/heads/main post-receive< refs/for/main/topic1