From patchwork Fri Oct 23 13:59:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 11853531 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 3694AC4363A for ; Fri, 23 Oct 2020 14:00:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E0EA7208C3 for ; Fri, 23 Oct 2020 14:00:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WqX5fgtn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750234AbgJWOAL (ORCPT ); Fri, 23 Oct 2020 10:00:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750228AbgJWOAK (ORCPT ); Fri, 23 Oct 2020 10:00: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 49B54C0613CE for ; Fri, 23 Oct 2020 07:00:10 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id d3so1691515wma.4 for ; Fri, 23 Oct 2020 07:00: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=aD3hSWme35bH5GSXz3sWxrYQFZCbTQubuUpDM8tkeS8=; b=WqX5fgtnSVJSZbGjXlaBuc8xlukmPunrUAtw2TcDlhNWsrukf7XCHELjkGR6+CZAQZ lOJ61ggPm/Lib0afY8nhfaJQLlMzusW80X8r9ct0ArqoXuEMjV1aiJKVJecTndiqjnoh +20xelXZLNWFP9AOQnCYZ/DSsKPJlSp3XlJRPxKbAK9Lfgc9TxCmBzJ/Bf1SrGlG8ZG9 ca6YD51x+1Ft1tn8qXlkWgBfg+Qup7YQR31ZuHm100rb5D1I9+2ZDRZHF9hlb6WSYC2D svOwck4JZ0HkJF8BL5OYGdeICfLtqAM0uEX7yG75m58aJ42yT5TNXodBcjhCWjglk+xW vZZA== 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=aD3hSWme35bH5GSXz3sWxrYQFZCbTQubuUpDM8tkeS8=; b=Z3vtx2FkB3SIdgwxoygST/2Y/G3dgVB1zyDIDH85h9+6/p9sMeDFuHCRo24j7g+DXS FqPXfoW3MX3NL9srlRmoZUiHb3Vub90QTpKmAc3a4x4liBsd9H+S5dk8qvLnvvPocHYI 771zkLX29HypTDmGjKqlosMS8rxzA9ylnFr1uvFJIyPyXsfoYBuXSJ33/bO6P9tOdfSk mGsjaPVg/Vww2O+yDi9dKg/vFVVDEJZnhiDtGn3c4fbl1vfCi33P61LMfqYIhUtADKNi 74CLkVqDUesOJaa/PpKGYR4VIpLESkIKNn9SIDF8D0MzH09x3oweWLMaIeQcEcxTH/jG JOYQ== X-Gm-Message-State: AOAM533+5boDgVEQemxR+8+XFWgFMRpYbXtrMqzuRrVA5+yLk5wi0J2g ++uj7hUoZ01Hj0kWGSaitnOb63LaxD8= X-Google-Smtp-Source: ABdhPJwV9cMXmJosiM2Q1TDha2j2ikeVoKnXtyDVJUIa24S/gWpDhWUGdjS0Wq6CBlwtTDQDSMkxBg== X-Received: by 2002:a1c:9e0e:: with SMTP id h14mr2396674wme.18.1603461608855; Fri, 23 Oct 2020 07:00:08 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id d129sm3441895wmf.19.2020.10.23.07.00.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 07:00:08 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Fri, 23 Oct 2020 13:59:58 +0000 Subject: [PATCH v2 1/9] fmt-merge-msg: also suppress "into main" by default 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 preparation for changing the default branch name to `main`, let's skip the suffix "into main" in merge commit messages, the same way that "into master" has been skipped by default. Signed-off-by: Johannes Schindelin --- fmt-merge-msg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c index bd22e1ea88..9a664a4a58 100644 --- a/fmt-merge-msg.c +++ b/fmt-merge-msg.c @@ -626,8 +626,10 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out, void *current_branch_to_free; struct merge_parents merge_parents; - if (!suppress_dest_pattern_seen) + if (!suppress_dest_pattern_seen) { + string_list_append(&suppress_dest_patterns, "main"); string_list_append(&suppress_dest_patterns, "master"); + } memset(&merge_parents, 0, sizeof(merge_parents)); From patchwork Fri Oct 23 13:59:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 11853541 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 707FCC388F9 for ; Fri, 23 Oct 2020 14:00:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0DDCF20FC3 for ; Fri, 23 Oct 2020 14:00:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qaPAXar+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750239AbgJWOAN (ORCPT ); Fri, 23 Oct 2020 10:00:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750228AbgJWOAM (ORCPT ); Fri, 23 Oct 2020 10:00:12 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95FB8C0613CE for ; Fri, 23 Oct 2020 07:00:11 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id e2so1700928wme.1 for ; Fri, 23 Oct 2020 07:00:11 -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=EoJI1ouLT/ZJfAuVhka/RIrJPu5Bifloh1/ncu4uzQk=; b=qaPAXar+2qSthDN1zXuAVNbH622kG9AxT4+oiUo2pXGO+dNqo/Um1t3fq+czbbfMBM 0OFH6LvHmzq5ppjJCDB2iLHD2M6cSZKdgxFNxyTgoWRHEhBD8fotOY4WM8FVOwntTXVS 6sIZroF0K4+w1lCWIE8veQJ50PPVCERGKSmBNhCp3tCbEwEPPyawePhfNlTAmsUPJ5AW 5k2UppD8Jcu07TMoxO+O//TOu8ajf8o8g5nB+OObzLEeDiQn93pLBYsuB+ZfrDsqb4dO 1yYvv52PXo2ZzTv+/mLrv0RPxot0XD1cuUoh07CcAf4KSH4sGb5ro183h5FBXzZMqHbc wveQ== 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=EoJI1ouLT/ZJfAuVhka/RIrJPu5Bifloh1/ncu4uzQk=; b=KqHc0K5FioZc9XaQUtVGZYOCTZr6zxY79dFOlfBP2k5d5bDIzjjt4ksLiVi3aTkzH4 yaHNFXhfALrDWf8wykHCWa2TSk7UagmcHhO+vOSPDgTNWMXopjUALivVMXLsvyu/NvNT 0lV0UUFRs2Tb/NngRInAwxY1u+ZIy3WKJsawWhEj3oe4DeI+8+1cXjGk7ddFPiYKO4a8 +XXS7YiBCoClyjaa/4WwsGcKTVI+GQ1ePayWiECqUopvS3LIqeaObq6r0u1zxoaPdjWQ 3x81grFcEb/Y1bc4ehJt0uqbflhjT7XUIXRCUcl3UcdlcfZ2st4qVoCqMaTNaod9DfMN v2og== X-Gm-Message-State: AOAM532gf6hUuE2lm3Fvknx1K5YBm3sHrg6et/TIyOAsSrgy3fBvM3F2 zl+LRnwuKQbJ77aZOP3c6zdPO2RvImc= X-Google-Smtp-Source: ABdhPJzcdUqJ7MoopvEbEAvWiyM9j8eh1MkEmdZr7U7xWR9+5l0SMLY8v1XM/xtmKwHaXOG/oTsO1A== X-Received: by 2002:a7b:cd96:: with SMTP id y22mr2545129wmj.126.1603461609990; Fri, 23 Oct 2020 07:00:09 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id t12sm3611503wrm.25.2020.10.23.07.00.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 07:00:09 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Fri, 23 Oct 2020 13:59:59 +0000 Subject: [PATCH v2 2/9] t9801: use `--` in preparation for default branch rename 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 Seeing as we want to use `main` as the new default branch name used by `git init`, and that `main` is used as directory name in t9801, let's tighten the rev-list arguments to make it explicit when we are referring to a ref instead of a directory. Signed-off-by: Johannes Schindelin --- t/t9801-git-p4-branch.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh index 67ff2711f5..a3abd778f9 100755 --- a/t/t9801-git-p4-branch.sh +++ b/t/t9801-git-p4-branch.sh @@ -67,7 +67,7 @@ test_expect_success 'import main, no branch detection' ' ( cd "$git" && git log --oneline --graph --decorate --all && - git rev-list master >wc && + git rev-list master -- >wc && test_line_count = 4 wc ) ' @@ -78,7 +78,7 @@ test_expect_success 'import branch1, no branch detection' ' ( cd "$git" && git log --oneline --graph --decorate --all && - git rev-list master >wc && + git rev-list master -- >wc && test_line_count = 2 wc ) ' @@ -89,7 +89,7 @@ test_expect_success 'import branch2, no branch detection' ' ( cd "$git" && git log --oneline --graph --decorate --all && - git rev-list master >wc && + git rev-list master -- >wc && test_line_count = 2 wc ) ' @@ -100,7 +100,7 @@ test_expect_success 'import depot, no branch detection' ' ( cd "$git" && git log --oneline --graph --decorate --all && - git rev-list master >wc && + git rev-list master -- >wc && test_line_count = 8 wc ) ' @@ -114,7 +114,7 @@ test_expect_success 'import depot, branch detection' ' git log --oneline --graph --decorate --all && # 4 main commits - git rev-list master >wc && + git rev-list master -- >wc && test_line_count = 4 wc && # 3 main, 1 integrate, 1 on branch2 @@ -137,7 +137,7 @@ test_expect_success 'import depot, branch detection, branchList branch definitio git log --oneline --graph --decorate --all && # 4 main commits - git rev-list master >wc && + git rev-list master -- >wc && test_line_count = 4 wc && # 3 main, 1 integrate, 1 on branch2 From patchwork Fri Oct 23 14:00:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 11853533 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 2A071C55179 for ; Fri, 23 Oct 2020 14:00:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BF96720FC3 for ; Fri, 23 Oct 2020 14:00:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Q7Ffy0Fd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750245AbgJWOAQ (ORCPT ); Fri, 23 Oct 2020 10:00:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750238AbgJWOAN (ORCPT ); Fri, 23 Oct 2020 10:00:13 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F4DEC0613D2 for ; Fri, 23 Oct 2020 07:00:13 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id d78so1583036wmd.3 for ; Fri, 23 Oct 2020 07:00:13 -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=GlvccKPW/RdUuG9NKhrLYpSY9nZzEMvWBUu2dHtP/mM=; b=Q7Ffy0Fd/GELpUxxAFh0EINCEqdx2qK3pCRudjgyfVv17iXkg5Pz2oafFSIVH0dw0G sn/CZx7r79cpPYGl1ltUmutQoD6SwZp5F5CRr4JGzQiVqf9d+Fce9XIEULVEtIhM9JQz SM8MOCay0Gd93HXV1APidR9GUF4UkpXb7kyw/4xDR7t8IK3jDCAN4RTbs5BLdwRvwdwH +t8kdTWlTK42rTE+t/sq2s4gN85DMOLblcpnLlFKVlIIQzYYreVZ2+YWxbS0263j4N9W usyJhynVDSq7N0krndphGDHfSlpr8v2dNDMn7OMFXp/gase5kYTQ1e0Q54QUFCrST57V TwWw== 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=GlvccKPW/RdUuG9NKhrLYpSY9nZzEMvWBUu2dHtP/mM=; b=BGZvFdyAFRq0Ixklbu7XRrNAzrqPIIkjlvVVx0UyEq5gXTwX7N8Bg1rAVJEd2nyrMV ui+jmot2hygGmROi9V6JJrh66Giv0XQgRjRYWUKXqz4jecLNFep3BQeNX+dr6fz/7M/G +v8UfQZRI/DWLf/oM87W7ECLhCrFUO4/bUBvnsoLHnbOtkPXHqtSlforwDvWKhaLyDMj augvtusFotXcDBlqMzptfdzg5YgfF/n48unfCOzKWhoGDiUFi7P/hh2rA8s0XjWiowZH cHFQqVAfu2wlE+TZ70p/WmfjBXlAfnn7pXdMgDsg2fYNQyo7XREpJUFoFX5I14r4Lr08 dzvg== X-Gm-Message-State: AOAM531Z/jXjJ2eltfduIb4Mu+g/WO6H3PWgudkLEQxZ8cSGmd2y7FCK T1Z4GAzvssJ0yGwIqWJMXJjQmg3Nt54= X-Google-Smtp-Source: ABdhPJyHtGSyW1xbG5YBk4xR0DLfxgAf8j0xSUL+rcSYEWeNWSGeMsuoR/+Y7lmHp8hu3y31BGW5RQ== X-Received: by 2002:a1c:a749:: with SMTP id q70mr2617130wme.117.1603461611860; Fri, 23 Oct 2020 07:00:11 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id e15sm3296914wro.13.2020.10.23.07.00.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 07:00:11 -0700 (PDT) Message-Id: <9bd0a89a79b6f771a3276ec3a3b70c6c636793b9.1603461606.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Fri, 23 Oct 2020 14:00:01 +0000 Subject: [PATCH v2 4/9] t6200: adjust suppression pattern to also match "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 In preparation to running t6200 with the default branch name set to "main", let's adjust the only non-trivial aspect thereof. The rest will be done via a trivial `sed` invocation. Signed-off-by: Johannes Schindelin --- t/t6200-fmt-merge-msg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh index 7d549748ef..f3e66eaf9b 100755 --- a/t/t6200-fmt-merge-msg.sh +++ b/t/t6200-fmt-merge-msg.sh @@ -556,7 +556,7 @@ test_expect_success 'merge.suppressDest configuration' ' head -n1 full.2 >actual && grep -e "Merge branch .side. into master$" actual && - git -c merge.suppressDest="ma??er" fmt-merge-msg <.git/FETCH_HEAD >full.3 && + git -c merge.suppressDest="ma?*[rn]" fmt-merge-msg <.git/FETCH_HEAD >full.3 && head -n1 full.3 >actual && grep -e "Merge branch .side." actual && ! grep -e " into master$" actual From patchwork Fri Oct 23 14:00:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 11853537 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 E6910C4363A for ; Fri, 23 Oct 2020 14:00:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7A5D220FC3 for ; Fri, 23 Oct 2020 14:00:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Uoqq1dfo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750254AbgJWOAW (ORCPT ); Fri, 23 Oct 2020 10:00:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750246AbgJWOAR (ORCPT ); Fri, 23 Oct 2020 10:00:17 -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 E4005C0613CE for ; Fri, 23 Oct 2020 07:00:16 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id c16so1696257wmd.2 for ; Fri, 23 Oct 2020 07:00:16 -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=BKbRSkXPcQHcQGnKZX1TuvUCbJMmbS1+4qVBRVDumII=; b=Uoqq1dfooUFLAF2rX7fcjL4hsmRXmX7REYLz1DCdvlDsKQaHzpOsZreR5Ca0Xf2YOl RbnTpbSp+Tq/p1fqKmVIIeerm8y6q9W8URF0sn355auijoiZPuv9l0A7sFQMiARpQNvp vyP/0VJ+9PzsYm5BCx5GtKgLKJhN79jbSFVQkwYEtIk9hzSJOTRPaRJiHxkypWiAmQaz dmkDGXnOvhFpXgefmL/5asLFLx/zh5fVcQ2w9J2cVVFzhlbi2TkkdeNcq+D9sdSyD0E6 VDIljX7fqzicX6NuYoP773LXa8/Z/tVj9MbHccH7dX8lKa+j0noA3HZjLNFIzmqT+htn fu4g== 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=BKbRSkXPcQHcQGnKZX1TuvUCbJMmbS1+4qVBRVDumII=; b=AKoY0c22lflZPlN8eOTekLr2p1d0+KetPT5168WgAPNOfUskwSm5E/ltKcrpr1u/wy YR5dFhC1WcvfAhVF0IXxRvVbo7cUI0kjtV6D9mHOHtndES3YJqXpzCKxjl6zu4OnBpU4 AqHhfohhJMU1UvEugbttWDW0ggmL3X6BHDv8dsa8HRDXG8/WlBtdtm/hIhNHpT6kmvDn rgyynJ2CJlBzOy/AAfwPyjCreI/bAuNT1u5stEX6b1aBA0MMpv+0ytX4n7YxiEZijHcF pnoKh02bei6ga4Y0VxEHGVYTUYCw1mjKcrOFwL41q1MR1kgRdbu/IwDuk+LT+GFtBBrG Hqfg== X-Gm-Message-State: AOAM531ObfhP4yH/J0yGDqiSPiu0XnBeT+1T0H413MpkIvUT1GLhXrJU HGPU4RIGUL7jVOs3P3nO5TKJ7/6/8JE= X-Google-Smtp-Source: ABdhPJyZZZzC9FGmzxjy8Rf33fDhI+a0Osae2MBL6wTiA44gepcs4/FRO0NLiQ8sDDpDm4fJHqpJ0Q== X-Received: by 2002:a1c:9647:: with SMTP id y68mr2403579wmd.101.1603461612612; Fri, 23 Oct 2020 07:00:12 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id m12sm3183482wrs.92.2020.10.23.07.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 07:00:12 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Fri, 23 Oct 2020 14:00:02 +0000 Subject: [PATCH v2 5/9] t5703: adjust a test case for the upcoming 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 We want to rename the default branch name used by `git init` in the near future, using `main` as the new name. In preparation for that, we adjust a test case that wants to rename the default branch to a different name that however has the same length. We use `none` as that name because it matches the length of `main`. As this test case cannot possibly pass until the default branch name is _actually_ changed, we temporarily guard it behind a special-purpose prereq, until the test suite is fully converted to use that new default branch name. Signed-off-by: Johannes Schindelin --- t/t5703-upload-pack-ref-in-want.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh index d9ecf0f4a9..b46940b725 100755 --- a/t/t5703-upload-pack-ref-in-want.sh +++ b/t/t5703-upload-pack-ref-in-want.sh @@ -383,14 +383,14 @@ test_expect_success 'server is initially behind - ref in want' ' test_cmp expected actual ' -test_expect_success 'server loses a ref - ref in want' ' +test_expect_success PREPARE_FOR_MAIN_BRANCH 'server loses a ref - ref in want' ' git -C "$REPO" config uploadpack.allowRefInWant true && rm -rf local && cp -r "$LOCAL_PRISTINE" local && - echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-perl" && + echo "s/main/rain/" >"$HTTPD_ROOT_PATH/one-time-perl" && test_must_fail git -C local fetch 2>err && - test_i18ngrep "fatal: remote error: unknown ref refs/heads/raster" err + test_i18ngrep "fatal: remote error: unknown ref refs/heads/rain" err ' # DO NOT add non-httpd-specific tests here, because the last part of this From patchwork Fri Oct 23 14:00:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 11853543 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 68221C55179 for ; Fri, 23 Oct 2020 14:00:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 105A52192A for ; Fri, 23 Oct 2020 14:00:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gqAQvo8E" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750248AbgJWOAR (ORCPT ); Fri, 23 Oct 2020 10:00:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750244AbgJWOAQ (ORCPT ); Fri, 23 Oct 2020 10:00:16 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99D3AC0613D2 for ; Fri, 23 Oct 2020 07:00:15 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id d3so1692031wma.4 for ; Fri, 23 Oct 2020 07:00:15 -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=WacbeA7HEoF6yYPhnvR0GMDR3Bko+fpf0Jw246MFhU0=; b=gqAQvo8ENfs9XikWR5fGE4+XCv49YjaCPkaS071kbW+irfUJDP2qLuQQ1MHYwmImSu HWCDqemTqFtu/4e19EFHpjPhyz/MY5d2p9VbPnN3j+ovK5HWLDhy3Mv5q5plqocGzM5M ROCxN/KVv2ligWOHZhYGzS06trq4yw12XdUeKBqn1cNR+AwaI3jdd6XIXw2iWidlJUZy 4RWtjZ0D69meMt7NwIf1AVna//mQy9On4qSMS9FvbwSvVmCFTqONhRSLgGNuItY9DJT5 ziVR4WIZbII5XTUWU9jv9Xel9N0L93X+FvJT/QcK0Vnw4hSkYol8+ppqJHGT+0IGFReR 2tCw== 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=WacbeA7HEoF6yYPhnvR0GMDR3Bko+fpf0Jw246MFhU0=; b=mdUBfYoyU7b9JYWBi9hZ6L3bsSqiCaiodHL0E9IPH8WuJHaxMKMkmwwAEh3cmhZRfv BhBKPerwtn/UprouUOrYxiWEnuf0/hPlemoj8EmFb1Rauq+sN4TdTkayV+m9VmeXch+a bQsNSMRH4vJZyGA+TmU6yp1UU5YzbPcgxuoQumaqffASCcnpcgsQuo6JJl1aev5GC4HA Q9jfeJBybQYCME4IQZlM90Xn1G6UlYjMMV8w8Hu7OfvCLNpmmZeLhuwmniXGhMEqCt5M +oMegCYZK5DdSv2CUCmWNgLck4wtTUenZpUKsQ3EtesNX8WSwnnO7wlnSaUxCJJY0xbG Sj0A== X-Gm-Message-State: AOAM531rP+bNGoXLN114qex9t+5p2JjZw/zOdeU9+vkGmATT9fd0WIJZ Nsw15mVQBBUAQXJQ0LYrnMmgfrlLN2Y= X-Google-Smtp-Source: ABdhPJzdcz5BEiOSM0xCZiIEIp5i9Ld2WueSFZCh7WE51JIIp8p4Kvnblko/h4OTOjKrw2DKnENHLw== X-Received: by 2002:a1c:e90a:: with SMTP id q10mr2339303wmc.57.1603461614220; Fri, 23 Oct 2020 07:00:14 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id t5sm4115552wrb.21.2020.10.23.07.00.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 07:00:13 -0700 (PDT) Message-Id: <8db960009d071ee3247c972dfceacdf02b3a3dd0.1603461606.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Fri, 23 Oct 2020 14:00:04 +0000 Subject: [PATCH v2 7/9] t9902: prepare a test for the upcoming 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 We need to adjust a test that uses a prefix of the default branch name, to accommodate for `main` being used soon. Signed-off-by: Johannes Schindelin --- t/t9902-completion.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 7b7bc6e4bd..0badcf829b 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -1055,13 +1055,13 @@ test_expect_success 'teardown after filtering matching refs' ' git -C otherrepo branch -D matching/branch-in-other ' -test_expect_success '__git_refs - for-each-ref format specifiers in prefix' ' +test_expect_success PREPARE_FOR_MAIN_BRANCH '__git_refs - for-each-ref format specifiers in prefix' ' cat >expected <<-EOF && evil-%%-%42-%(refname)..master EOF ( - cur="evil-%%-%42-%(refname)..mas" && - __git_refs "" "" "evil-%%-%42-%(refname).." mas >"$actual" + cur="evil-%%-%42-%(refname)..mai" && + __git_refs "" "" "evil-%%-%42-%(refname).." mai >"$actual" ) && test_cmp expected "$actual" ' From patchwork Fri Oct 23 14:00:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 11853547 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 A2CEFC55179 for ; Fri, 23 Oct 2020 14:00:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3298520FC3 for ; Fri, 23 Oct 2020 14:00:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JmaPvhc1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750258AbgJWOAY (ORCPT ); Fri, 23 Oct 2020 10:00:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750250AbgJWOAR (ORCPT ); Fri, 23 Oct 2020 10:00:17 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 132BCC0613D2 for ; Fri, 23 Oct 2020 07:00:17 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id n18so1965997wrs.5 for ; Fri, 23 Oct 2020 07:00:16 -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=9YAUbemPjdqgb13YBIt9R7T10dy3CBjCCxSBTtLskDA=; b=JmaPvhc15hAGTG0JL0azV3iYdB5tM8U4uU4pmM3OEPaUqMaJO39a1BUF5VuB35SlYY +RI0C1zriiW18rqf8hYzl/kw6GZYaM/52UfiU55cV9dtTZZpuczUmj55ADknlfJOe3LS 0ln+57HIwa07nU4kx3vYQfA9R32iXaylJ/t5/wWuW1fsXw5kLEl07DIxHlXeBGttBzD2 hlmVZTAAffNBvKz05vDmU5F8WeQE8RnLs7u0xlNoALJoiHUi0V4pFrQpwcxcS81cOsXu mUDkKflK7mB1HcsxH42kASu9temArrv1Ge1A8rfZb0QBp16kZfSCLCdclnEUCkZzv85T 43fw== 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=9YAUbemPjdqgb13YBIt9R7T10dy3CBjCCxSBTtLskDA=; b=cZ5oz2v7/bWXskSWOBXD8Fbgqrcx52GflXex89L3MFprXeS72vD9k0ixsIKmasIuzQ JKJjQog2pPVPbIJtxjqs1mFkokvUo7expXUfV+JoYrNTtou0jBhK7o2uNuYGhF/oTSsm Fl3x+7Bn/UfcOEpulk21JmI6p9HBVwLgcwKyebuHdvu3sBm96l7Y5DNoj+nnAkVGgstc F6FalU14G9a9/F/9iYnQuKDriQyk74YfZ285PbQX4lNRz0qzLwDqVPq5cqN/H0b8o+y8 Tk3Xxr2PSBc4Q6ZBP97aoTOQ8V+RFnmn3YEBnXReJgm2VyTEBLGNtmicmCFLKnXsLma6 oSLQ== X-Gm-Message-State: AOAM531hCWuf+6r7obuNmYNeEyad8T5q9uBG/EYwlpLgyuw4Wvurgadp a1ylsajTE8T+makAIPjCkZ5K/pUaaBg= X-Google-Smtp-Source: ABdhPJyEqJEue89d13g5Oq3uqFdqM+GvByqoJK2TYJ3F718hVns+/gfQ4HXuZNu/QK5D7zHSGWGn8w== X-Received: by 2002:a05:6000:108:: with SMTP id o8mr2732763wrx.256.1603461615236; Fri, 23 Oct 2020 07:00:15 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f17sm3599729wme.22.2020.10.23.07.00.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 07:00:14 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Fri, 23 Oct 2020 14:00:05 +0000 Subject: [PATCH v2 8/9] tests: prepare aligned mentions of 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 some tests, the default branch name is part of aligned output. As we want to change the default branch name to `main`, which is two characters shorter than the old default branch name, we will have to adjust those tests. Since we use the original default branch name until the entire test suite has been adjusted accordingly, the touched test cases need to be guarded by a prereq (that is so far disabled so that they are skipped for now). The test cases that depend on those test cases that are newly guarded by that prereq naturally have to be guarded, too. Signed-off-by: Johannes Schindelin --- t/t3200-branch.sh | 12 +++--- t/t3201-branch-contains.sh | 8 ++-- t/t3203-branch-output.sh | 4 +- t/t3205-branch-color.sh | 8 ++-- t/t5505-remote.sh | 30 +++++++-------- t/t5510-fetch.sh | 8 ++-- t/t5526-fetch-submodules.sh | 70 +++++++++++++++++----------------- t/t6302-for-each-ref-filter.sh | 24 ++++++------ 8 files changed, 82 insertions(+), 82 deletions(-) diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 55b24b76ce..a0b832d59e 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -321,11 +321,11 @@ test_expect_success 'git branch --list -v with --abbrev' ' ' -test_expect_success 'git branch --column' ' +test_expect_success PREPARE_FOR_MAIN_BRANCH 'git branch --column' ' COLUMNS=81 git branch --column=column >actual && cat >expect <<\EOF && - a/b/c bam foo l * master n o/p r - abc bar j/k m/m mb o/o q topic + a/b/c bam foo l * main n o/p r + abc bar j/k m/m mb o/o q topic EOF test_cmp expect actual ' @@ -358,15 +358,15 @@ EOF test_cmp expect actual ' -test_expect_success 'git branch with column.*' ' +test_expect_success PREPARE_FOR_MAIN_BRANCH 'git branch with column.*' ' git config column.ui column && git config column.branch "dense" && COLUMNS=80 git branch >actual && git config --unset column.branch && git config --unset column.ui && cat >expect <<\EOF && - a/b/c bam foo l * master n o/p r - abc bar j/k m/m mb o/o q topic + a/b/c bam foo l * main n o/p r + abc bar j/k m/m mb o/o q topic EOF test_cmp expect actual ' diff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh index efea5c4971..3733cd0091 100755 --- a/t/t3201-branch-contains.sh +++ b/t/t3201-branch-contains.sh @@ -242,7 +242,7 @@ test_expect_success 'branch --merged combined with --no-merged' ' # Here "topic" tracks "master" with one extra commit, and "zzz" points to the # same tip as master The name "zzz" must come alphabetically after "topic" # as we process them in that order. -test_expect_success 'branch --merged with --verbose' ' +test_expect_success PREPARE_FOR_MAIN_BRANCH 'branch --merged with --verbose' ' git branch --track topic master && git branch zzz topic && git checkout topic && @@ -256,9 +256,9 @@ test_expect_success 'branch --merged with --verbose' ' test_cmp expect actual && git branch --verbose --merged topic >actual && cat >expect <<-EOF && - master $(git rev-parse --short master) second on master - * topic $(git rev-parse --short topic ) [ahead 1] foo - zzz $(git rev-parse --short zzz ) second on master + main $(git rev-parse --short main) second on main + * topic $(git rev-parse --short topic ) [ahead 1] foo + zzz $(git rev-parse --short zzz ) second on main EOF test_i18ncmp expect actual ' diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh index 71818b90f0..d65586541d 100755 --- a/t/t3203-branch-output.sh +++ b/t/t3203-branch-output.sh @@ -329,7 +329,7 @@ test_expect_success '--color overrides auto-color' ' test_cmp expect.color actual ' -test_expect_success 'verbose output lists worktree path' ' +test_expect_success PREPARE_FOR_MAIN_BRANCH 'verbose output lists worktree path' ' one=$(git rev-parse --short HEAD) && two=$(git rev-parse --short master) && cat >expect <<-EOF && @@ -337,7 +337,7 @@ test_expect_success 'verbose output lists worktree path' ' ambiguous $one one branch-one $two two + branch-two $one ($(pwd)/worktree_dir) one - master $two two + main $two two ref-to-branch $two two ref-to-remote $two two EOF diff --git a/t/t3205-branch-color.sh b/t/t3205-branch-color.sh index 4f1e16bb44..289625c464 100755 --- a/t/t3205-branch-color.sh +++ b/t/t3205-branch-color.sh @@ -28,12 +28,12 @@ test_expect_success 'regular output shows colors' ' test_cmp expect actual ' -test_expect_success 'verbose output shows colors' ' +test_expect_success PREPARE_FOR_MAIN_BRANCH 'verbose output shows colors' ' oid=$(git rev-parse --short HEAD) && cat >expect <<-EOF && - * master $oid foo - other $oid foo - remotes/origin/master $oid foo + * main $oid foo + other $oid foo + remotes/origin/main $oid foo EOF git branch --color -v -a >actual.raw && test_decode_color actual && diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 8d62edd98b..de0e3df14a 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -200,28 +200,28 @@ cat >test/expect <test/expect < refspec DWIM and advice' ' ) ' -test_expect_success 'refs/remotes/* refspec and unqualified DWIM and advice' ' +test_expect_success PREPARE_FOR_MAIN_BRANCH 'refs/remotes/* refspec and unqualified DWIM and advice' ' ( cd two && git tag -a -m "Some tag" my-tag master && diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index dbc724e4c0..5d673358f9 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -942,7 +942,7 @@ test_expect_success 'fetching with auto-gc does not lock up' ' ) ' -test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' ' +test_expect_success PREPARE_FOR_MAIN_BRANCH,C_LOCALE_OUTPUT 'fetch aligned output' ' git clone . full-output && test_commit looooooooooooong-tag && ( @@ -951,13 +951,13 @@ test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' ' grep -e "->" actual | cut -c 22- >../actual ) && cat >expect <<-\EOF && - master -> origin/master + main -> origin/main looooooooooooong-tag -> looooooooooooong-tag EOF test_cmp expect actual ' -test_expect_success C_LOCALE_OUTPUT 'fetch compact output' ' +test_expect_success PREPARE_FOR_MAIN_BRANCH,C_LOCALE_OUTPUT 'fetch compact output' ' git clone . compact && test_commit extraaa && ( @@ -966,7 +966,7 @@ test_expect_success C_LOCALE_OUTPUT 'fetch compact output' ' grep -e "->" actual | cut -c 22- >../actual ) && cat >expect <<-\EOF && - master -> origin/* + main -> origin/* extraaa -> * EOF test_cmp expect actual diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh index 63205dfdf9..dd8e423d25 100755 --- a/t/t5526-fetch-submodules.sh +++ b/t/t5526-fetch-submodules.sh @@ -18,7 +18,7 @@ add_upstream_commit() { head2=$(git rev-parse --short HEAD) && echo "Fetching submodule submodule" > ../expect.err && echo "From $pwd/submodule" >> ../expect.err && - echo " $head1..$head2 master -> origin/master" >> ../expect.err + echo " $head1..$head2 main -> origin/main" >> ../expect.err ) && ( cd deepsubmodule && @@ -30,7 +30,7 @@ add_upstream_commit() { head2=$(git rev-parse --short HEAD) && echo "Fetching submodule submodule/subdir/deepsubmodule" >> ../expect.err echo "From $pwd/deepsubmodule" >> ../expect.err && - echo " $head1..$head2 master -> origin/master" >> ../expect.err + echo " $head1..$head2 main -> origin/main" >> ../expect.err ) } @@ -61,7 +61,7 @@ test_expect_success setup ' ) ' -test_expect_success "fetch --recurse-submodules recurses into submodules" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "fetch --recurse-submodules recurses into submodules" ' add_upstream_commit && ( cd downstream && @@ -71,7 +71,7 @@ test_expect_success "fetch --recurse-submodules recurses into submodules" ' test_i18ncmp expect.err actual.err ' -test_expect_success "submodule.recurse option triggers recursive fetch" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "submodule.recurse option triggers recursive fetch" ' add_upstream_commit && ( cd downstream && @@ -81,7 +81,7 @@ test_expect_success "submodule.recurse option triggers recursive fetch" ' test_i18ncmp expect.err actual.err ' -test_expect_success "fetch --recurse-submodules -j2 has the same output behaviour" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "fetch --recurse-submodules -j2 has the same output behaviour" ' add_upstream_commit && ( cd downstream && @@ -111,7 +111,7 @@ test_expect_success "fetch --no-recurse-submodules only fetches superproject" ' test_must_be_empty actual.err ' -test_expect_success "using fetchRecurseSubmodules=true in .gitmodules recurses into submodules" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "using fetchRecurseSubmodules=true in .gitmodules recurses into submodules" ' ( cd downstream && git config -f .gitmodules submodule.submodule.fetchRecurseSubmodules true && @@ -141,7 +141,7 @@ test_expect_success "using fetchRecurseSubmodules=false in .git/config overrides test_must_be_empty actual.err ' -test_expect_success "--recurse-submodules overrides fetchRecurseSubmodules setting from .git/config" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "--recurse-submodules overrides fetchRecurseSubmodules setting from .git/config" ' ( cd downstream && git fetch --recurse-submodules >../actual.out 2>../actual.err && @@ -170,7 +170,7 @@ test_expect_success "--quiet propagates to parallel submodules" ' test_must_be_empty actual.err ' -test_expect_success "--dry-run propagates to submodules" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "--dry-run propagates to submodules" ' add_upstream_commit && ( cd downstream && @@ -180,7 +180,7 @@ test_expect_success "--dry-run propagates to submodules" ' test_i18ncmp expect.err actual.err ' -test_expect_success "Without --dry-run propagates to submodules" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "Without --dry-run propagates to submodules" ' ( cd downstream && git fetch --recurse-submodules >../actual.out 2>../actual.err @@ -189,7 +189,7 @@ test_expect_success "Without --dry-run propagates to submodules" ' test_i18ncmp expect.err actual.err ' -test_expect_success "recurseSubmodules=true propagates into submodules" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "recurseSubmodules=true propagates into submodules" ' add_upstream_commit && ( cd downstream && @@ -200,7 +200,7 @@ test_expect_success "recurseSubmodules=true propagates into submodules" ' test_i18ncmp expect.err actual.err ' -test_expect_success "--recurse-submodules overrides config in submodule" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "--recurse-submodules overrides config in submodule" ' add_upstream_commit && ( cd downstream && @@ -225,7 +225,7 @@ test_expect_success "--no-recurse-submodules overrides config setting" ' test_must_be_empty actual.err ' -test_expect_success "Recursion doesn't happen when no new commits are fetched in the superproject" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion doesn't happen when no new commits are fetched in the superproject" ' ( cd downstream && ( @@ -239,13 +239,13 @@ test_expect_success "Recursion doesn't happen when no new commits are fetched in test_must_be_empty actual.err ' -test_expect_success "Recursion stops when no new submodule commits are fetched" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion stops when no new submodule commits are fetched" ' head1=$(git rev-parse --short HEAD) && git add submodule && git commit -m "new submodule" && head2=$(git rev-parse --short HEAD) && echo "From $pwd/." > expect.err.sub && - echo " $head1..$head2 master -> origin/master" >>expect.err.sub && + echo " $head1..$head2 main -> origin/main" >>expect.err.sub && head -3 expect.err >> expect.err.sub && ( cd downstream && @@ -255,7 +255,7 @@ test_expect_success "Recursion stops when no new submodule commits are fetched" test_must_be_empty actual.out ' -test_expect_success "Recursion doesn't happen when new superproject commits don't change any submodules" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion doesn't happen when new superproject commits don't change any submodules" ' add_upstream_commit && head1=$(git rev-parse --short HEAD) && echo a > file && @@ -263,7 +263,7 @@ test_expect_success "Recursion doesn't happen when new superproject commits don' git commit -m "new file" && head2=$(git rev-parse --short HEAD) && echo "From $pwd/." > expect.err.file && - echo " $head1..$head2 master -> origin/master" >> expect.err.file && + echo " $head1..$head2 main -> origin/main" >> expect.err.file && ( cd downstream && git fetch >../actual.out 2>../actual.err @@ -272,7 +272,7 @@ test_expect_success "Recursion doesn't happen when new superproject commits don' test_i18ncmp expect.err.file actual.err ' -test_expect_success "Recursion picks up config in submodule" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion picks up config in submodule" ' ( cd downstream && git fetch --recurse-submodules && @@ -287,7 +287,7 @@ test_expect_success "Recursion picks up config in submodule" ' git commit -m "new submodule" && head2=$(git rev-parse --short HEAD) && echo "From $pwd/." > expect.err.sub && - echo " $head1..$head2 master -> origin/master" >> expect.err.sub && + echo " $head1..$head2 main -> origin/main" >> expect.err.sub && cat expect.err >> expect.err.sub && ( cd downstream && @@ -301,7 +301,7 @@ test_expect_success "Recursion picks up config in submodule" ' test_must_be_empty actual.out ' -test_expect_success "Recursion picks up all submodules when necessary" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion picks up all submodules when necessary" ' add_upstream_commit && ( cd submodule && @@ -316,14 +316,14 @@ test_expect_success "Recursion picks up all submodules when necessary" ' head2=$(git rev-parse --short HEAD) && echo "Fetching submodule submodule" > ../expect.err.sub && echo "From $pwd/submodule" >> ../expect.err.sub && - echo " $head1..$head2 master -> origin/master" >> ../expect.err.sub + echo " $head1..$head2 main -> origin/main" >> ../expect.err.sub ) && head1=$(git rev-parse --short HEAD) && git add submodule && git commit -m "new submodule" && head2=$(git rev-parse --short HEAD) && echo "From $pwd/." > expect.err.2 && - echo " $head1..$head2 master -> origin/master" >> expect.err.2 && + echo " $head1..$head2 main -> origin/main" >> expect.err.2 && cat expect.err.sub >> expect.err.2 && tail -3 expect.err >> expect.err.2 && ( @@ -334,7 +334,7 @@ test_expect_success "Recursion picks up all submodules when necessary" ' test_must_be_empty actual.out ' -test_expect_success "'--recurse-submodules=on-demand' doesn't recurse when no new commits are fetched in the superproject (and ignores config)" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' doesn't recurse when no new commits are fetched in the superproject (and ignores config)" ' add_upstream_commit && ( cd submodule && @@ -349,7 +349,7 @@ test_expect_success "'--recurse-submodules=on-demand' doesn't recurse when no ne head2=$(git rev-parse --short HEAD) && echo Fetching submodule submodule > ../expect.err.sub && echo "From $pwd/submodule" >> ../expect.err.sub && - echo " $head1..$head2 master -> origin/master" >> ../expect.err.sub + echo " $head1..$head2 main -> origin/main" >> ../expect.err.sub ) && ( cd downstream && @@ -361,14 +361,14 @@ test_expect_success "'--recurse-submodules=on-demand' doesn't recurse when no ne test_must_be_empty actual.err ' -test_expect_success "'--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)" ' head1=$(git rev-parse --short HEAD) && git add submodule && git commit -m "new submodule" && head2=$(git rev-parse --short HEAD) && tail -3 expect.err > expect.err.deepsub && echo "From $pwd/." > expect.err && - echo " $head1..$head2 master -> origin/master" >>expect.err && + echo " $head1..$head2 main -> origin/main" >>expect.err && cat expect.err.sub >> expect.err && cat expect.err.deepsub >> expect.err && ( @@ -389,7 +389,7 @@ test_expect_success "'--recurse-submodules=on-demand' recurses as deep as necess test_i18ncmp expect.err actual.err ' -test_expect_success "'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)" ' add_upstream_commit && head1=$(git rev-parse --short HEAD) && echo a >> file && @@ -397,7 +397,7 @@ test_expect_success "'--recurse-submodules=on-demand' stops when no new submodul git commit -m "new file" && head2=$(git rev-parse --short HEAD) && echo "From $pwd/." > expect.err.file && - echo " $head1..$head2 master -> origin/master" >> expect.err.file && + echo " $head1..$head2 main -> origin/main" >> expect.err.file && ( cd downstream && git fetch --recurse-submodules=on-demand >../actual.out 2>../actual.err @@ -406,7 +406,7 @@ test_expect_success "'--recurse-submodules=on-demand' stops when no new submodul test_i18ncmp expect.err.file actual.err ' -test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "'fetch.recurseSubmodules=on-demand' overrides global config" ' ( cd downstream && git fetch --recurse-submodules @@ -418,7 +418,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config git commit -m "new submodule" && head2=$(git rev-parse --short HEAD) && echo "From $pwd/." > expect.err.2 && - echo " $head1..$head2 master -> origin/master" >>expect.err.2 && + echo " $head1..$head2 main -> origin/main" >>expect.err.2 && head -3 expect.err >> expect.err.2 && ( cd downstream && @@ -434,7 +434,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config test_i18ncmp expect.err.2 actual.err ' -test_expect_success "'submodule..fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "'submodule..fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules" ' ( cd downstream && git fetch --recurse-submodules @@ -446,7 +446,7 @@ test_expect_success "'submodule..fetchRecurseSubmodules=on-demand' override git commit -m "new submodule" && head2=$(git rev-parse --short HEAD) && echo "From $pwd/." > expect.err.2 && - echo " $head1..$head2 master -> origin/master" >>expect.err.2 && + echo " $head1..$head2 main -> origin/main" >>expect.err.2 && head -3 expect.err >> expect.err.2 && ( cd downstream && @@ -462,7 +462,7 @@ test_expect_success "'submodule..fetchRecurseSubmodules=on-demand' override test_i18ncmp expect.err.2 actual.err ' -test_expect_success "don't fetch submodule when newly recorded commits are already present" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "don't fetch submodule when newly recorded commits are already present" ' ( cd submodule && git checkout -q HEAD^^ @@ -472,7 +472,7 @@ test_expect_success "don't fetch submodule when newly recorded commits are alrea git commit -m "submodule rewound" && head2=$(git rev-parse --short HEAD) && echo "From $pwd/." > expect.err && - echo " $head1..$head2 master -> origin/master" >> expect.err && + echo " $head1..$head2 main -> origin/main" >> expect.err && ( cd downstream && git fetch >../actual.out 2>../actual.err @@ -485,7 +485,7 @@ test_expect_success "don't fetch submodule when newly recorded commits are alrea ) ' -test_expect_success "'fetch.recurseSubmodules=on-demand' works also without .gitmodules entry" ' +test_expect_success PREPARE_FOR_MAIN_BRANCH "'fetch.recurseSubmodules=on-demand' works also without .gitmodules entry" ' ( cd downstream && git fetch --recurse-submodules @@ -497,7 +497,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' works also without .git git commit -m "new submodule without .gitmodules" && head2=$(git rev-parse --short HEAD) && echo "From $pwd/." >expect.err.2 && - echo " $head1..$head2 master -> origin/master" >>expect.err.2 && + echo " $head1..$head2 main -> origin/main" >>expect.err.2 && head -3 expect.err >>expect.err.2 && ( cd downstream && diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh index 781e470aea..0a21669f56 100755 --- a/t/t6302-for-each-ref-filter.sh +++ b/t/t6302-for-each-ref-filter.sh @@ -113,9 +113,9 @@ test_expect_success '%(color) must fail' ' test_must_fail git for-each-ref --format="%(color)%(refname)" ' -test_expect_success 'left alignment is default' ' +test_expect_success PREPARE_FOR_MAIN_BRANCH 'left alignment is default' ' cat >expect <<-\EOF && - refname is refs/heads/master |refs/heads/master + refname is refs/heads/main |refs/heads/main refname is refs/heads/side |refs/heads/side refname is refs/odd/spot |refs/odd/spot refname is refs/tags/annotated-tag|refs/tags/annotated-tag @@ -131,9 +131,9 @@ test_expect_success 'left alignment is default' ' test_cmp expect actual ' -test_expect_success 'middle alignment' ' +test_expect_success PREPARE_FOR_MAIN_BRANCH 'middle alignment' ' cat >expect <<-\EOF && - | refname is refs/heads/master |refs/heads/master + | refname is refs/heads/main |refs/heads/main | refname is refs/heads/side |refs/heads/side | refname is refs/odd/spot |refs/odd/spot |refname is refs/tags/annotated-tag|refs/tags/annotated-tag @@ -149,9 +149,9 @@ test_expect_success 'middle alignment' ' test_cmp expect actual ' -test_expect_success 'right alignment' ' +test_expect_success PREPARE_FOR_MAIN_BRANCH 'right alignment' ' cat >expect <<-\EOF && - | refname is refs/heads/master|refs/heads/master + | refname is refs/heads/main|refs/heads/main | refname is refs/heads/side|refs/heads/side | refname is refs/odd/spot|refs/odd/spot |refname is refs/tags/annotated-tag|refs/tags/annotated-tag @@ -168,7 +168,7 @@ test_expect_success 'right alignment' ' ' cat >expect <<-\EOF -| refname is refs/heads/master |refs/heads/master +| refname is refs/heads/main |refs/heads/main | refname is refs/heads/side |refs/heads/side | refname is refs/odd/spot |refs/odd/spot | refname is refs/tags/annotated-tag |refs/tags/annotated-tag @@ -184,7 +184,7 @@ EOF test_align_permutations() { while read -r option do - test_expect_success "align:$option" ' + test_expect_success PREPARE_FOR_MAIN_BRANCH "align:$option" ' git for-each-ref --format="|%(align:$option)refname is %(refname)%(end)|%(refname)" >actual && test_cmp expect actual ' @@ -213,9 +213,9 @@ EOF # Individual atoms inside %(align:...) and %(end) must not be quoted. -test_expect_success 'alignment with format quote' " +test_expect_success PREPARE_FOR_MAIN_BRANCH 'alignment with format quote' " cat >expect <<-\EOF && - |' '\''master| A U Thor'\'' '| + |' '\''main| A U Thor'\'' '| |' '\''side| A U Thor'\'' '| |' '\''odd/spot| A U Thor'\'' '| |' '\''annotated-tag| '\'' '| @@ -231,9 +231,9 @@ test_expect_success 'alignment with format quote' " test_cmp expect actual " -test_expect_success 'nested alignment with quote formatting' " +test_expect_success PREPARE_FOR_MAIN_BRANCH 'nested alignment with quote formatting' " cat >expect <<-\EOF && - |' master '| + |' main '| |' side '| |' odd/spot '| |' annotated-tag '| From patchwork Fri Oct 23 14:00:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 11853545 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 2469BC388F9 for ; Fri, 23 Oct 2020 14:00:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BD24520FC3 for ; Fri, 23 Oct 2020 14:00:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XHcar6wQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750256AbgJWOAX (ORCPT ); Fri, 23 Oct 2020 10:00:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750244AbgJWOAR (ORCPT ); Fri, 23 Oct 2020 10:00:17 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37378C0613D4 for ; Fri, 23 Oct 2020 07:00:17 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id e2so1701529wme.1 for ; Fri, 23 Oct 2020 07:00:17 -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=+G9Ybvk3PdGH/bvSc2WcFyK357mlVRLtv839GOt1vvE=; b=XHcar6wQ0cHfATJGINmcW2JNzY317QATuE4rA/UPhz6qLpE5FNQ2XTlX2If9x6bfkV uLUEoP7nIZheNd1L5REeR4zqu/sj5FZAyc036SYyIxyqSxcCnbLk3kLc9B6bljkDcYRH mCCK66IVHbZyMb6dU2NTmv9+o6U1GoqszVp1D7ZUc5OKCyRLC5c94pnwSHSNUYEqe2YB 869xet/99hLwhcdwW3Oy1XmqA3kSPopvnmbSTeWRhkqCwXJK3nt6IaDHxFWvQkVUiAhC BuPHcAVNoTybz53fwmgox27hyISb239UTAFhvmLtZeOsgSfxnOlg7dK1W1RihBoKv24m yTFw== 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=+G9Ybvk3PdGH/bvSc2WcFyK357mlVRLtv839GOt1vvE=; b=CyStmZFgcT/ZM60oi8jX5sM5ECvflHuJ+xT9Gwf3NQefOdvF2dGPsT2iZnN95y0Br5 WPPrFQ1VR7tT3+x25oW2FQemEQaCRs58rW4+ythRNEe+r1xR4u66XL6TCr+0FB/6FQli DkskpXyxV+LB0xYxMu1G1AhuKUEVdsqKci98gvqYBqHyNav+j+q8v0PglSL4B4AAGbQ7 Hst5C7sWnIPLgsC86t2dXgWWJ+o1B9Ye1eFAPXff5ifJTyBhEP6BwXpFD2jNyF8FfnM2 reMnXH17/48gYbVA9obLEwyYwpXIfVWI8yaUcByP1/DxY2USh0ZUA7OQJ+B2bJq+u1Sl WWow== X-Gm-Message-State: AOAM530E0gq9WXmwrOgOBTseW7sPQv7DqnR1ebb+mcKrMMPvjf6YqPFg OtMbgJPoR/5+MHBGsATi229xGHHXocU= X-Google-Smtp-Source: ABdhPJxodBbKefhzQ9UWVSl5h/TQlW94idqwC7dtq72zDCeAEbtztXrXpeJhJXpyTh3MZ1qBHdRaSg== X-Received: by 2002:a1c:2b05:: with SMTP id r5mr2413583wmr.179.1603461615843; Fri, 23 Oct 2020 07:00:15 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id p21sm3555870wmc.28.2020.10.23.07.00.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 07:00:15 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Fri, 23 Oct 2020 14:00:06 +0000 Subject: [PATCH v2 9/9] t1400: prepare for `main` being 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, there are three non-trivial adjustments necessary. Mark the respective test cases with the transitional prereq and make those non-trivial adjustments early, to make this change easier to review. Signed-off-by: Johannes Schindelin --- t/t1400-update-ref.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index 770e7be363..4c01e08551 100755 --- a/t/t1400-update-ref.sh +++ b/t/t1400-update-ref.sh @@ -585,10 +585,10 @@ test_expect_success 'stdin fails on unbalanced quotes' ' grep "fatal: badly quoted argument: \\\"master" err ' -test_expect_success 'stdin fails on invalid escape' ' - echo "create $a \"ma\zter\"" >stdin && +test_expect_success PREPARE_FOR_MAIN_BRANCH 'stdin fails on invalid escape' ' + echo "create $a \"ma\zn\"" >stdin && test_must_fail git update-ref --stdin err && - grep "fatal: badly quoted argument: \\\"ma\\\\zter\\\"" err + grep "fatal: badly quoted argument: \\\"ma\\\\zn\\\"" err ' test_expect_success 'stdin fails on junk after quoted argument' ' @@ -704,9 +704,9 @@ test_expect_success 'stdin succeeds with quoted argument' ' test_cmp expect actual ' -test_expect_success 'stdin succeeds with escaped character' ' +test_expect_success PREPARE_FOR_MAIN_BRANCH 'stdin succeeds with escaped character' ' git update-ref -d $a && - echo "create $a \"ma\\163ter\"" >stdin && + echo "create $a \"ma\\151n\"" >stdin && git update-ref --stdin expect && git rev-parse $a >actual &&