From patchwork Wed Sep 16 18:10:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_Avila_via_GitGitGadget?= X-Patchwork-Id: 11780365 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7146A6CA for ; Wed, 16 Sep 2020 18:12:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 53DE62083B for ; Wed, 16 Sep 2020 18:12:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="io68xU74" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727736AbgIPSMF (ORCPT ); Wed, 16 Sep 2020 14:12:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727717AbgIPSK5 (ORCPT ); Wed, 16 Sep 2020 14:10:57 -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 8BB2CC061756 for ; Wed, 16 Sep 2020 11:10:56 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id k15so7858923wrn.10 for ; Wed, 16 Sep 2020 11:10:56 -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=a99TZs8RDfEzZQgrvCmmxLFT3tTlt4p0jVhkvTLfJno=; b=io68xU74T3OErxLfxWsqQMu9gjsEHCfPJ0l/G+HkoxDglbId1NgRNSkshdOewU+DDH cRZi5MTVX6Wba8COMm/mRi6D8EgvlhSrEvN9+++XJDfC/H2YdMUt8lQYlDbo1KLcESZy Al1SXM9gIPB+EH8Vc9Xkm3Zf9xrWcxsJxNZ0d+DEmj3Q8bmr8rgwL3E0vCrxMwcYXGUu g2pXMn8eiG9a17aEHgPk4g4hf1FjJ6b3OBja6FugNRfkAYoZC4N3WnZy2P1cpR/kRYdO 4J6IqiDG5LkCh0D3r32MkRaJ7ACrzngPwLPGKDmpF54X3O5aKyeLXE/YpS+PWtBvVgJZ N1EA== 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=a99TZs8RDfEzZQgrvCmmxLFT3tTlt4p0jVhkvTLfJno=; b=LE9tWgjyQtoG2HtVLdbRmVH1teNfw78GX8NNwLobyicWxWjXy81m80uHbV7jiHUgaR 27dMIJYorilBW5xZWoaIrltJUZgytBv+Vl0xYpMWaHwPC/QOrmDYhGnG2mbwGoLyrZke 2pSJIp8VdSIFP3YcexauX0Fgk3XxOSOIbERUSNqzzj4ld8H/63yUFUfBvTQyqx89YDoZ WCQL8Jphm7YzjaBuFwid9Lgt2QJ1uvkXWO8NPagQ2oS2rYT7rGJNbifY7ksZNLB13CWZ +ZWfaYEio1Lz3kiV4tdnzqZASYjfAqrVdecBxIoKtleVydczr10bqfwQDMzpHOSEFRH1 cWwQ== X-Gm-Message-State: AOAM532CJwrizwZjPNduZ7wWv9dOl7273EUshVu6bM5/tANyp3h3zT2h qw/f5zr7OTUtjXagbnDx94+RRM9E/iM= X-Google-Smtp-Source: ABdhPJw1OFRZQrRp/Mqf75enPCwyky3crh05nAPF7wiJHdIQjafy0Egr6JOKwvjpsG72bqilOjHWkg== X-Received: by 2002:adf:ec86:: with SMTP id z6mr28686349wrn.109.1600279855041; Wed, 16 Sep 2020 11:10:55 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y5sm32931999wrh.6.2020.09.16.11.10.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 11:10:54 -0700 (PDT) Message-Id: <587ddca42ae36be3d5b333cefe1f9af768bacc9a.1600279853.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Date: Wed, 16 Sep 2020 18:10:49 +0000 Subject: [PATCH 1/5] fast-export: avoid using unnecessary language in a code comment Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin In an ongoing effort to avoid non-inclusive language, let's avoid using the branch name "master" in a code comment. Signed-off-by: Johannes Schindelin --- builtin/fast-export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 1b8fca3ee0..5527135ba8 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -1026,7 +1026,7 @@ static void handle_tags_and_duplicates(struct string_list *extras) /* * Getting here means we have a commit which * was excluded by a negative refspec (e.g. - * fast-export ^master master). If we are + * fast-export ^HEAD HEAD). If we are * referencing excluded commits, set the ref * to the exact commit. Otherwise, the user * wants the branch exported but every commit From patchwork Wed Sep 16 18:10:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_Avila_via_GitGitGadget?= X-Patchwork-Id: 11780363 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CEBD16CA for ; Wed, 16 Sep 2020 18:12:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B25AC21655 for ; Wed, 16 Sep 2020 18:12:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OSGqnEY7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727221AbgIPSMC (ORCPT ); Wed, 16 Sep 2020 14:12:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727823AbgIPSK5 (ORCPT ); Wed, 16 Sep 2020 14:10:57 -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 70A31C061788 for ; Wed, 16 Sep 2020 11:10:57 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id l15so2768587wmh.1 for ; Wed, 16 Sep 2020 11:10:57 -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=0ybg95cjBoMd3k6bGS4hd0gm5wPr+J8ekwzSJZveA/s=; b=OSGqnEY7W/vxuOBhkGnccZXkyo4i4rGcqGaiNZdrw4zWZ8XcvEZf7UQbor96HQEnV0 DlKf9CehwJEIsAI75G+de5syfEeJPMDxhpaHae0taQ4Lp0Hiyrn2UtsmZnj3n2L5Gr8n uVHyZP3xstsw7B/Q/llAhzU3085YeF88oBfji9k2Pm9LuNy7XGROzk2PFlejtUnzFjmz BLbsIloGYrEyE+feH3Ra+A3useAwvfrfFlFLeTjEJ0TbDQIgezfSQ8OUi6/gz+0K+5a+ vaXNVQdxv19x9nfv0xXm+o93cKXakVJOPi+vGZWUNTkKaartqv9l4srxFFnahxqP6vX5 YEuA== 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=0ybg95cjBoMd3k6bGS4hd0gm5wPr+J8ekwzSJZveA/s=; b=h0XwgG5IGEdjS5BZ/9zl6PKNwuTxZ/9dSTOjS3NR5NWcoBiyYk2vJFVduSMewajtu5 4PGkNtwcsYOR9IhxiaTqDpDz4hLZ434wHJqk3rBaztrRvXxwofGeXlgnwmXW2YWJbB3F 6gSQauE9Y+qKVyIQ4QPD0DITW4DNZJN0SMgDc2hczw3S3xIE2iNhnyict3q/XdOkwUxl N/EZSMdGfD1i8tkv98opL566Qp0n/K55aCImsqakow7y2siernEmFrEnxXKFDo6iVw5I PnDD2V10Do5e/vDU7J3UEqeofxsSObtW1otZuNtAzQCQSX10+mXJz7C+bOCj/Dc8aaAU e68A== X-Gm-Message-State: AOAM532ulYennrmkrkS/WePn2ZmkTozLUDhpfbnGXGkDW63/psd+Sneh 3KGF6VaHrqLM7Vvxt9YG/4do/J+YHsg= X-Google-Smtp-Source: ABdhPJyK3e/nirrlYHq41a4YCuY2ueiA2xGVO1VoEDNt4vuZem/SNPvmG5b9WAm0ghlEuyj7u9xeYw== X-Received: by 2002:a1c:4886:: with SMTP id v128mr6133366wma.139.1600279855894; Wed, 16 Sep 2020 11:10:55 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f14sm34229600wrv.72.2020.09.16.11.10.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 11:10:55 -0700 (PDT) Message-Id: <3b4ae48d4a3a7e2d6aae259ead19b6643d2533e8.1600279853.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Date: Wed, 16 Sep 2020 18:10:50 +0000 Subject: [PATCH 2/5] t/test-terminal: avoid non-inclusive language Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin In the ongoing effort to make the Git project a more inclusive place, let's try to avoid names like "master" where possible. In this instance, the use of the term `slave` is unfortunately enshrined in IO::Pty's API. We simply cannot avoid using that word here. But at least we can get rid of the usage of the word `master` and hope that IO::Pty will be eventually adjusted, too. Signed-off-by: Johannes Schindelin --- t/test-terminal.perl | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/t/test-terminal.perl b/t/test-terminal.perl index 46bf618479..680caf48dd 100755 --- a/t/test-terminal.perl +++ b/t/test-terminal.perl @@ -81,24 +81,24 @@ sub copy_stdio { die "usage: test-terminal program args"; } $ENV{TERM} = 'vt100'; -my $master_in = new IO::Pty; -my $master_out = new IO::Pty; -my $master_err = new IO::Pty; -$master_in->set_raw(); -$master_out->set_raw(); -$master_err->set_raw(); -$master_in->slave->set_raw(); -$master_out->slave->set_raw(); -$master_err->slave->set_raw(); -my $pid = start_child(\@ARGV, $master_in->slave, $master_out->slave, $master_err->slave); -close $master_in->slave; -close $master_out->slave; -close $master_err->slave; -my $in_pid = copy_stdin($master_in); -copy_stdio($master_out, $master_err); +my $primary_in = new IO::Pty; +my $primary_out = new IO::Pty; +my $primary_err = new IO::Pty; +$primary_in->set_raw(); +$primary_out->set_raw(); +$primary_err->set_raw(); +$primary_in->slave->set_raw(); +$primary_out->slave->set_raw(); +$primary_err->slave->set_raw(); +my $pid = start_child(\@ARGV, $primary_in->slave, $primary_out->slave, $primary_err->slave); +close $primary_in->slave; +close $primary_out->slave; +close $primary_err->slave; +my $in_pid = copy_stdin($primary_in); +copy_stdio($primary_out, $primary_err); my $ret = finish_child($pid); # If the child process terminates before our copy_stdin() process is able to -# write all of its data to $master_in, the copy_stdin() process could stall. +# write all of its data to $primary_in, the copy_stdin() process could stall. # Send SIGTERM to it to ensure it terminates. kill 'TERM', $in_pid; finish_child($in_pid); From patchwork Wed Sep 16 18:10:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_Avila_via_GitGitGadget?= X-Patchwork-Id: 11780357 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 36F74139F for ; Wed, 16 Sep 2020 18:11:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 13D0B21582 for ; Wed, 16 Sep 2020 18:11:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QlNceXHF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727834AbgIPSLU (ORCPT ); Wed, 16 Sep 2020 14:11:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727824AbgIPSK7 (ORCPT ); Wed, 16 Sep 2020 14:10:59 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BFBE2C06178A for ; Wed, 16 Sep 2020 11:10:58 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id a17so7871753wrn.6 for ; Wed, 16 Sep 2020 11:10:58 -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=taLM5yJC4q70gBaQS2BtCUXe5AzClQ56TFn++ZP02kk=; b=QlNceXHF67znrNKRIDUDDfhxtSc2yDCxNLwaGZlr1zIu6iyC1AGUWdp2u0Xv/q3/0+ Pee6NFE8ClZoYJHrc2OH8yBCaTpkq1u7E+WGHpJrTJDLmO86NBmISJea2qqUw+/grhIZ ctdlxk1DVbyIEZXfXXJJWj643cgmd4/XoBsslNYREq+GHq0l6EXEz9+iBNTSygifjLqp AxkPLSOKcuWq7mXdNtm4LBVquiovv8SbdWfFQcKCTfcjqWcRMXHgT0dBJhW4poN1pypY WKAKu7oFEtRuVuO7bg6IGTGktJDG4P/ig4s+tZEpddkW+ye6rHRj10O5nHaXCmnvM1ad bmvw== 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=taLM5yJC4q70gBaQS2BtCUXe5AzClQ56TFn++ZP02kk=; b=TEHhH2IBAvs4EA0i3A3BVpJ9FefuIJugGvUsNpayrjxWEbgODzYitSnfgAXyqSS7h6 YXUczIpCtOORn4JG8rzVj+UZOzUdGJUptrBTNv+3iwR6rtqUrpSSfJCfBV+9p2cT2B4M DjGHHI9NuxcAPRycaGcPtb/Fo86ZXdpuUMxu2JgD9qE/zsZDZWtSthQ/noFcFHK3gFrP nN7/naypfu8dLq3LgYhZ+c8NbhoEWdj8Tf2FfaB5tW6xLPNS7WzzodZmyFKkl0DkIjM6 lsNrfTuPQtca10lMpOju/eDtC71xMMDRESHaTU4RDcSeTlXfoaQAwEsd7K8dblu2bQNQ Qr5g== X-Gm-Message-State: AOAM530P3qkDqNtysdaPNi7uUUyt43oarmlVsaIBPiRQcDC7QVavVW5j sJgwPazbm39zuXlCDgGpliqyvJLg9w0= X-Google-Smtp-Source: ABdhPJyoIw0nLlFy6+xIH1JlfHURIXWnbneW+ShNrCzBvAYCJc6k6eSFZ4TIOVrjSkYzSXBrV6GG6w== X-Received: by 2002:adf:fa0c:: with SMTP id m12mr27634454wrr.406.1600279856702; Wed, 16 Sep 2020 11:10:56 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a83sm6664734wmh.48.2020.09.16.11.10.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 11:10:56 -0700 (PDT) Message-Id: <2f1d0a2df41f567bc1a8bc446c26e1cb8b6dc36c.1600279853.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Date: Wed, 16 Sep 2020 18:10:51 +0000 Subject: [PATCH 3/5] t3200: avoid variations of the `master` branch name Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin To avoid branch names with a loaded history, we already started to avoid using the name "master" in a couple instances. The `t3200-branch.sh` script uses variations of this name for branches other than the default one. So let's change those names, as "lowest-hanging fruits" in the effort to use more inclusive naming throughout Git's source code. In this particular instance, this requires a couple of non-trivial adjustments, as the aligned output depends on the maximum length of the displayed branches (which we now changed), and also on the alphabetical order (which we now changed, too). Signed-off-by: Johannes Schindelin --- t/t3200-branch.sh | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 4c0734157b..c1b881c0b8 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -234,10 +234,10 @@ test_expect_success 'git branch -M master master should work when master is chec git branch -M master master ' -test_expect_success 'git branch -M master2 master2 should work when master is checked out' ' +test_expect_success 'git branch -M main2 main2 should work when master is checked out' ' git checkout master && - git branch master2 && - git branch -M master2 master2 + git branch main2 && + git branch -M main2 main2 ' test_expect_success 'git branch -v -d t should work' ' @@ -324,8 +324,8 @@ test_expect_success 'git branch --list -v with --abbrev' ' test_expect_success 'git branch --column' ' COLUMNS=81 git branch --column=column >actual && cat >expect <<\EOF && - a/b/c bam foo l * master mb o/o q - abc bar j/k m/m master2 n o/p r + a/b/c bam foo l main2 mb o/o q + abc bar j/k m/m * master n o/p r EOF test_cmp expect actual ' @@ -345,8 +345,8 @@ test_expect_success 'git branch --column with an extremely long branch name' ' j/k l m/m + main2 * master - master2 mb n o/o @@ -365,8 +365,8 @@ test_expect_success 'git branch with column.*' ' git config --unset column.branch && git config --unset column.ui && cat >expect <<\EOF && - a/b/c bam foo l * master mb o/o q - abc bar j/k m/m master2 n o/p r + a/b/c bam foo l main2 mb o/o q + abc bar j/k m/m * master n o/p r EOF test_cmp expect actual ' @@ -377,7 +377,7 @@ test_expect_success 'git branch --column -v should fail' ' test_expect_success 'git branch -v with column.ui ignored' ' git config column.ui column && - COLUMNS=80 git branch -v | cut -c -10 | sed "s/ *$//" >actual && + COLUMNS=80 git branch -v | cut -c -9 | sed "s/ *$//" >actual && git config --unset column.ui && cat >expect <<\EOF && a/b/c @@ -388,8 +388,8 @@ test_expect_success 'git branch -v with column.ui ignored' ' j/k l m/m + main2 * master - master2 mb n o/o @@ -597,10 +597,10 @@ test_expect_success 'git branch -C master master should work when master is chec git branch -C master master ' -test_expect_success 'git branch -C master5 master5 should work when master is checked out' ' +test_expect_success 'git branch -C main5 main5 should work when master is checked out' ' git checkout master && - git branch master5 && - git branch -C master5 master5 + git branch main5 && + git branch -C main5 main5 ' test_expect_success 'git branch -C ab cd should overwrite existing config for cd' ' @@ -711,11 +711,11 @@ test_expect_success 'deleting a self-referential symref' ' ' test_expect_success 'renaming a symref is not allowed' ' - git symbolic-ref refs/heads/master2 refs/heads/master && - test_must_fail git branch -m master2 master3 && - git symbolic-ref refs/heads/master2 && + git symbolic-ref refs/heads/main2 refs/heads/master && + test_must_fail git branch -m main2 main3 && + git symbolic-ref refs/heads/main2 && test_path_is_file .git/refs/heads/master && - test_path_is_missing .git/refs/heads/master3 + test_path_is_missing .git/refs/heads/main3 ' test_expect_success SYMLINKS 'git branch -m u v should fail when the reflog for u is a symlink' ' From patchwork Wed Sep 16 18:10:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_Avila_via_GitGitGadget?= X-Patchwork-Id: 11780359 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 78A986CA for ; Wed, 16 Sep 2020 18:11:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 44E6521655 for ; Wed, 16 Sep 2020 18:11:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Pjctdbta" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727836AbgIPSLV (ORCPT ); Wed, 16 Sep 2020 14:11:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727826AbgIPSK7 (ORCPT ); Wed, 16 Sep 2020 14:10:59 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F2F1C06178B for ; Wed, 16 Sep 2020 11:10:59 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id a9so4000315wmm.2 for ; Wed, 16 Sep 2020 11:10:59 -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=eFfCfL2fVYM46GHt+9xlO1j7LYZ8fwv/l63YTHjQ2lQ=; b=Pjctdbtaqnxj6BX6aOagxCgiHmYAB9kdXYdCjqrhrAxjg/eV9zJ3FnO05hchALgxUj MZ3cL69gHHPT5sRSoBiLCCyfm+uIPSLVN/EeZoLZk8ADtuYvHMlAGd10oDJISwXXo7BN 5WUM330X8WiyRV+MVqDX0jqjtLQgdV+10XjaupefzQNV4pGv5h4Ppo//my0dLyG+sX3E OGaXVf+gPyY7thefEZh8P2krK8xe8I5VCdzMlflPEYmHK22JvB2K0wchxZJzei1A8l6r kyQkWQiQXk5v83KIB0BdPepyHYGUk57FSljrwJkqTYIeCXJa1pK8FEv095/YVzLpxLP+ zMDQ== 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=eFfCfL2fVYM46GHt+9xlO1j7LYZ8fwv/l63YTHjQ2lQ=; b=q5acu/SH1tImMu19yX88sCmgCkgo2XDsenOcmaqEfed9hhQqvWpy379CDkFrOM091r dPRChNvqxP1sLNmReQjTeEWCNyTo8UmNVW3E48B/Z5JZ630KXL1Hf/xccMnz2D6Rl9pt +PcOQkVsT+gI2Gk/RqiyGYnQToMrd6n8krzYwdf9wN4s+VpVFAhv/sfuHL4pViKoWs5w rqinClGrKChMErJy7ckKoMFxq1cYMw3798ulet0BIiNcVrYqSpuzimm3t4yfo1W63emm bsMBCqPnW/XD4tSDhpUVa7sCHS8wRe7l7cIAlTVjSi1pQkxd+uoqwUCLg6uE2XeZUwW7 XVag== X-Gm-Message-State: AOAM531/wb/1VK9tfjCOoOqVcqwy9upqRiJ+n/zOYnKagL0VrXAoRDAC QAbvOs9A0dkxnH+U4mehvkVc5EvhSqY= X-Google-Smtp-Source: ABdhPJw1E0iHiYAagYkLfB8EJrh/DTDb59e261KpW+2IVe37xklu6jEb/FgW/WBY7KPVU090tiLzCA== X-Received: by 2002:a1c:7714:: with SMTP id t20mr5942837wmi.186.1600279857520; Wed, 16 Sep 2020 11:10:57 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id d5sm35471066wrb.28.2020.09.16.11.10.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 11:10:57 -0700 (PDT) Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Date: Wed, 16 Sep 2020 18:10:52 +0000 Subject: [PATCH 4/5] tests: avoid variations of the `master` branch name Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin The term `master` has a loaded history that serves as a constant reminder of racial injustice. The Git project has no desire to perpetuate this and already started avoiding it. The test suite uses variations of this name for branches other than the default one. Apart from t3200, where we just addressed this in the previous commit, those instances can be renamed in an automated manner because they do not require any changes outside of the test script, so let's do that. Seeing as `main` seems to be materializing as the favorite default branch name of many Open Source projects, we use that name in our replacements, too. This trick was performed by this (GNU) sed invocation: $ sed -i 's/master\([a-z0-9]\)/main\1/g' t/t*.sh Signed-off-by: Johannes Schindelin --- t/t3427-rebase-subtree.sh | 42 ++++++++++++++++++------------------ t/t4150-am.sh | 8 +++---- t/t5515-fetch-merge-logic.sh | 6 +++--- t/t5523-push-upstream.sh | 20 ++++++++--------- t/t6018-rev-list-glob.sh | 6 +++--- t/t6040-tracking-info.sh | 20 ++++++++--------- t/t6409-merge-subtree.sh | 14 ++++++------ 7 files changed, 58 insertions(+), 58 deletions(-) diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh index 79e43a370b..ba27e9d603 100755 --- a/t/t3427-rebase-subtree.sh +++ b/t/t3427-rebase-subtree.sh @@ -15,12 +15,12 @@ commit_message() { # this test script tries to document them. First, the following commit history # is generated (the onelines are shown, time flows from left to right): # -# master1 - master2 - master3 +# main1 - main2 - main3 # \ -# README ---------------------- Add subproject master - master4 - files_subtree/master5 +# README ---------------------- Add subproject master - main4 - files_subtree/main5 # # Where the merge moves the files master[123].t into the subdirectory -# files_subtree/ and master4 as well as files_subtree/master5 add files to that +# files_subtree/ and main4 as well as files_subtree/main5 add files to that # directory directly. # # Then, in subsequent test cases, `git filter-branch` is used to distill just @@ -28,11 +28,11 @@ commit_message() { # an empty commit is added on top. The pre-rebase commit history looks like # this: # -# Add subproject master - master4 - files_subtree/master5 - Empty commit +# Add subproject master - main4 - files_subtree/main5 - Empty commit # -# where the root commit adds three files: master1.t, master2.t and master3.t. +# where the root commit adds three files: main1.t, main2.t and main3.t. # -# This commit history is then rebased onto `master3` with the +# This commit history is then rebased onto `main3` with the # `-Xsubtree=files_subtree` option in three different ways: # # 1. using `--preserve-merges` @@ -43,9 +43,9 @@ test_expect_success 'setup' ' test_commit README && git init files && - test_commit -C files master1 && - test_commit -C files master2 && - test_commit -C files master3 && + test_commit -C files main1 && + test_commit -C files main2 && + test_commit -C files main3 && : perform subtree merge into files_subtree/ && git fetch files refs/heads/master:refs/heads/files-master && @@ -55,8 +55,8 @@ test_expect_success 'setup' ' git commit -m "Add subproject master" && : add two extra commits to rebase && - test_commit -C files_subtree master4 && - test_commit files_subtree/master5 && + test_commit -C files_subtree main4 && + test_commit files_subtree/main5 && git checkout -b to-rebase && git fast-export --no-data HEAD -- files_subtree/ | @@ -66,22 +66,22 @@ test_expect_success 'setup' ' git commit -m "Empty commit" --allow-empty ' -# FAILURE: Does not preserve master4. +# FAILURE: Does not preserve main4. test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' ' reset_rebase && git checkout -b rebase-preserve-merges to-rebase && git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master && - verbose test "$(commit_message HEAD~)" = "master4" && - verbose test "$(commit_message HEAD)" = "files_subtree/master5" + verbose test "$(commit_message HEAD~)" = "main4" && + verbose test "$(commit_message HEAD)" = "files_subtree/main5" ' -# FAILURE: Does not preserve master4. +# FAILURE: Does not preserve main4. test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit' ' reset_rebase && git checkout -b rebase-keep-empty to-rebase && git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master && - verbose test "$(commit_message HEAD~2)" = "master4" && - verbose test "$(commit_message HEAD~)" = "files_subtree/master5" && + verbose test "$(commit_message HEAD~2)" = "main4" && + verbose test "$(commit_message HEAD~)" = "files_subtree/main5" && verbose test "$(commit_message HEAD)" = "Empty commit" ' @@ -91,8 +91,8 @@ test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' ' test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --onto files-master master && : first pick results in no changes && git rebase --skip && - verbose test "$(commit_message HEAD~2)" = "master4" && - verbose test "$(commit_message HEAD~)" = "files_subtree/master5" && + verbose test "$(commit_message HEAD~2)" = "main4" && + verbose test "$(commit_message HEAD~)" = "files_subtree/main5" && verbose test "$(commit_message HEAD)" = "Empty commit" ' @@ -102,8 +102,8 @@ test_expect_success 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit' test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-master --root && : first pick results in no changes && git rebase --skip && - verbose test "$(commit_message HEAD~2)" = "master4" && - verbose test "$(commit_message HEAD~)" = "files_subtree/master5" && + verbose test "$(commit_message HEAD~2)" = "main4" && + verbose test "$(commit_message HEAD~)" = "files_subtree/main5" && verbose test "$(commit_message HEAD)" = "Empty commit" ' diff --git a/t/t4150-am.sh b/t/t4150-am.sh index 1da8ab120b..3d8dc7eb12 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -465,7 +465,7 @@ test_expect_success 'am changes committer and keeps author' ' test_expect_success 'am --signoff adds Signed-off-by: line' ' rm -fr .git/rebase-apply && git reset --hard && - git checkout -b master2 first && + git checkout -b main2 first && git am --signoff \n\n" \ @@ -479,7 +479,7 @@ test_expect_success 'am --signoff adds Signed-off-by: line' ' ' test_expect_success 'am stays in branch' ' - echo refs/heads/master2 >expected && + echo refs/heads/main2 >expected && git symbolic-ref HEAD >actual && test_cmp expected actual ' @@ -540,7 +540,7 @@ test_expect_success 'am without --keep removes Re: and [PATCH] stuff' ' git reset --hard HEAD^ && git am expected && - git rev-parse master2 >actual && + git rev-parse main2 >actual && test_cmp expected actual ' @@ -567,7 +567,7 @@ test_expect_success 'am --keep-non-patch really keeps the non-patch part' ' test_expect_success 'setup am -3' ' rm -fr .git/rebase-apply && git reset --hard && - git checkout -b base3way master2 && + git checkout -b base3way main2 && sed -n -e "3,\$p" msg >file && head -n 9 msg >>file && git add file && diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh index 9d6a46ff56..b1c18cc993 100755 --- a/t/t5515-fetch-merge-logic.sh +++ b/t/t5515-fetch-merge-logic.sh @@ -15,7 +15,7 @@ export GIT_TEST_PROTOCOL_VERSION build_script () { script="$1" && - for i in one three_file master master2 one_tree three two two2 three2 + for i in one three_file master main2 one_tree three two two2 three2 do echo "s/$(test_oid --hash=sha1 "$i")/$(test_oid "$i")/g" >>"$script" done @@ -52,8 +52,8 @@ test_expect_success setup ' two sha1:525b7fb068d59950d185a8779dc957c77eed73ba two sha256:3b21de3440cd38c2a9e9b464adb923f7054949ed4c918e1a0ac4c95cd52774db - master2 sha1:754b754407bf032e9a2f9d5a9ad05ca79a6b228f - master2 sha256:6c7abaea8a6d8ef4d89877e68462758dc6774690fbbbb0e6d7dd57415c9abde0 + main2 sha1:754b754407bf032e9a2f9d5a9ad05ca79a6b228f + main2 sha256:6c7abaea8a6d8ef4d89877e68462758dc6774690fbbbb0e6d7dd57415c9abde0 two2 sha1:6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 two2 sha256:87a2d3ee29c83a3dc7afd41c0606b11f67603120b910a7be7840accdc18344d4 diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh index c0df81a014..6b5f2e373d 100755 --- a/t/t5523-push-upstream.sh +++ b/t/t5523-push-upstream.sh @@ -41,20 +41,20 @@ test_expect_success 'push -u --dry-run master:otherX' ' check_config master upstream refs/heads/other ' -test_expect_success 'push -u master2:master2' ' - git branch master2 && - git push -u upstream master2:master2 && - check_config master2 upstream refs/heads/master2 +test_expect_success 'push -u main2:main2' ' + git branch main2 && + git push -u upstream main2:main2 && + check_config main2 upstream refs/heads/main2 ' -test_expect_success 'push -u master2:other2' ' - git push -u upstream master2:other2 && - check_config master2 upstream refs/heads/other2 +test_expect_success 'push -u main2:other2' ' + git push -u upstream main2:other2 && + check_config main2 upstream refs/heads/other2 ' -test_expect_success 'push -u :master2' ' - git push -u upstream :master2 && - check_config master2 upstream refs/heads/other2 +test_expect_success 'push -u :main2' ' + git push -u upstream :main2 && + check_config main2 upstream refs/heads/other2 ' test_expect_success 'push -u --all' ' diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh index b31ff7eeec..5df38a39e5 100755 --- a/t/t6018-rev-list-glob.sh +++ b/t/t6018-rev-list-glob.sh @@ -32,11 +32,11 @@ test_expect_success 'setup' ' git checkout -b someref master && commit some && git checkout master && - commit master2 && + commit main2 && git tag foo/bar master && - commit master3 && + commit main3 && git update-ref refs/remotes/foo/baz master && - commit master4 && + commit main4 && git update-ref refs/remotes/upstream/one subspace/one && git update-ref refs/remotes/upstream/two subspace/two && git update-ref refs/remotes/upstream/x subspace-x && diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh index ad1922b999..946d05c879 100755 --- a/t/t6040-tracking-info.sh +++ b/t/t6040-tracking-info.sh @@ -264,25 +264,25 @@ test_expect_success 'fail to track annotated tags' ' test_expect_success '--set-upstream-to does not change branch' ' git branch from-master master && git branch --set-upstream-to master from-master && - git branch from-master2 master && - test_must_fail git config branch.from-master2.merge > actual && - git rev-list from-master2 && - git update-ref refs/heads/from-master2 from-master2^ && - git rev-parse from-master2 >expect2 && - git branch --set-upstream-to master from-master2 && + git branch from-main2 master && + test_must_fail git config branch.from-main2.merge > actual && + git rev-list from-main2 && + git update-ref refs/heads/from-main2 from-main2^ && + git rev-parse from-main2 >expect2 && + git branch --set-upstream-to master from-main2 && git config branch.from-master.merge > actual && - git rev-parse from-master2 >actual2 && + git rev-parse from-main2 >actual2 && grep -q "^refs/heads/master$" actual && cmp expect2 actual2 ' test_expect_success '--set-upstream-to @{-1}' ' git checkout follower && - git checkout from-master2 && - git config branch.from-master2.merge > expect2 && + git checkout from-main2 && + git config branch.from-main2.merge > expect2 && git branch --set-upstream-to @{-1} from-master && git config branch.from-master.merge > actual && - git config branch.from-master2.merge > actual2 && + git config branch.from-main2.merge > actual2 && git branch --set-upstream-to follower from-master && git config branch.from-master.merge > expect && test_cmp expect2 actual2 && diff --git a/t/t6409-merge-subtree.sh b/t/t6409-merge-subtree.sh index 793f0c8bf3..8189c7879e 100755 --- a/t/t6409-merge-subtree.sh +++ b/t/t6409-merge-subtree.sh @@ -94,10 +94,10 @@ test_expect_success 'merge update' ' echo git-gui2 > git-gui.sh && o3=$(git hash-object git-gui.sh) && git add git-gui.sh && - git checkout -b master2 && + git checkout -b main2 && git commit -m "update git-gui" && cd ../git && - git pull -s subtree gui master2 && + git pull -s subtree gui main2 && git ls-files -s >actual && ( echo "100644 $o3 0 git-gui/git-gui.sh" && @@ -109,7 +109,7 @@ test_expect_success 'merge update' ' test_expect_success 'initial ambiguous subtree' ' cd ../git && git reset --hard master && - git checkout -b master2 && + git checkout -b main2 && git merge -s ours --no-commit gui/master && git read-tree --prefix=git-gui2/ -u gui/master && git commit -m "Merge git-gui2 as our subdirectory" && @@ -125,8 +125,8 @@ test_expect_success 'initial ambiguous subtree' ' test_expect_success 'merge using explicit' ' cd ../git && - git reset --hard master2 && - git pull -Xsubtree=git-gui gui master2 && + git reset --hard main2 && + git pull -Xsubtree=git-gui gui main2 && git ls-files -s >actual && ( echo "100644 $o3 0 git-gui/git-gui.sh" && @@ -138,8 +138,8 @@ test_expect_success 'merge using explicit' ' test_expect_success 'merge2 using explicit' ' cd ../git && - git reset --hard master2 && - git pull -Xsubtree=git-gui2 gui master2 && + git reset --hard main2 && + git pull -Xsubtree=git-gui2 gui main2 && git ls-files -s >actual && ( echo "100644 $o1 0 git-gui/git-gui.sh" && From patchwork Wed Sep 16 18:10:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_Avila_via_GitGitGadget?= X-Patchwork-Id: 11780361 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C34B7139F for ; Wed, 16 Sep 2020 18:11:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A7A1C21941 for ; Wed, 16 Sep 2020 18:11:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Wxh5fnM5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727755AbgIPSLa (ORCPT ); Wed, 16 Sep 2020 14:11:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727830AbgIPSLP (ORCPT ); Wed, 16 Sep 2020 14:11:15 -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 A6115C061797 for ; Wed, 16 Sep 2020 11:10:59 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id e16so7905131wrm.2 for ; Wed, 16 Sep 2020 11:10:59 -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=Iaubz4Z5RCnlOaRNxePs2n3D8EJw5yieWuKUtsG0RpQ=; b=Wxh5fnM5iT21cB9Gz44citR+6rtW/h67G/m7e8bGFr9QSizsU7CMRYs3J0AiPMBHZ/ SMIdEA5F5cupFp4viCIi/kiXkOH+PLFauOFAW0crGX2L0gr0GDzTQazkshjSe0jrZH28 PoT2rusWWOZ8mvq5lq63JXH2ZJE475jjLEUVyJB3nTm5ZRaKWuvh5g3hV8zcGcHPSGWw UE9rlPSUN4cWhy/CLKc2dT8bYNny1OTDw/ttP/FFURSZIAxCz0tmpkbz2Op6XG3KgB8o 0v8phLn8K0IDLklqEOi7yqdMHmJvJ6nQzvcw5xqsiqIRFNXlbCwLWcmq6BXQve2125j8 2NGg== 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=Iaubz4Z5RCnlOaRNxePs2n3D8EJw5yieWuKUtsG0RpQ=; b=rSQdkxxeuxffLMgKMcySc4ZY7LGL9DU5WP7M17bQpGCFGqD52SYLP3bvlWb4myKwZx sCzabus8GgFTeS+6Gbh+CpqpzjTZE+idSM//IA2kUUyhUao/QGcoFWO7gUzCcKbN8RlU 9yCvCxS3JCx+f/0/g5WL56rULCsjNwTmJLA0CtLVQOU/sAhIwZvf9OnAzVYVsB5tm0YR EE6JOYzSjxPS/YJuVWEEGNATtdRazmXHlDgTmyjhg0xh1S3qdVjxtKMRbcx42fH5zXGB dxubLoR2i7EWVb7fGjz06e+xm/fbOAIs8XbZrm7c0xa4DUib+x8Zu8F5GyexVS+VL/W4 zwJQ== X-Gm-Message-State: AOAM532/Af/WLmLS5yEUk48R8lXU1Ycs3LZ0vr2CKyL0qqdMFD7q4qrQ Dcbe1yQZzsedlBsJ6UsbtVR75ZBcbLM= X-Google-Smtp-Source: ABdhPJxMVGryu+Xi0vjzFS2vXbnEbwzuIY40rQBgoaeZFbgFDCcit0QIT0IJWxJt7qh3fo779O9c9Q== X-Received: by 2002:adf:8481:: with SMTP id 1mr27200129wrg.231.1600279858260; Wed, 16 Sep 2020 11:10:58 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id d18sm34460921wrm.10.2020.09.16.11.10.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 11:10:57 -0700 (PDT) Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Date: Wed, 16 Sep 2020 18:10:53 +0000 Subject: [PATCH 5/5] t9902: avoid using the branch name `master` Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin The completion tests used that name unnecessarily, and it is a non-inclusive term, so let's avoid using it here. Signed-off-by: Johannes Schindelin --- t/t9902-completion.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 8425b9a531..7b7bc6e4bd 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -542,37 +542,37 @@ test_expect_success '__gitcomp - doesnt fail because of invalid variable name' ' ' read -r -d "" refs <<-\EOF +main maint -master next seen EOF test_expect_success '__gitcomp_nl - trailing space' ' test_gitcomp_nl "m" "$refs" <<-EOF + main Z maint Z - master Z EOF ' test_expect_success '__gitcomp_nl - prefix' ' test_gitcomp_nl "--fixup=m" "$refs" "--fixup=" "m" <<-EOF + --fixup=main Z --fixup=maint Z - --fixup=master Z EOF ' test_expect_success '__gitcomp_nl - suffix' ' test_gitcomp_nl "branch.ma" "$refs" "branch." "ma" "." <<-\EOF + branch.main.Z branch.maint.Z - branch.master.Z EOF ' test_expect_success '__gitcomp_nl - no suffix' ' test_gitcomp_nl "ma" "$refs" "" "ma" "" <<-\EOF + mainZ maintZ - masterZ EOF '