From patchwork Sat Sep 26 21:04:20 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: 11801665 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 E1A6E112E for ; Sat, 26 Sep 2020 21:04:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C59EE21531 for ; Sat, 26 Sep 2020 21:04:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gbPqtycL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727143AbgIZVEd (ORCPT ); Sat, 26 Sep 2020 17:04:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726822AbgIZVE3 (ORCPT ); Sat, 26 Sep 2020 17:04:29 -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 A9798C0613D4 for ; Sat, 26 Sep 2020 14:04:28 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id e2so2821626wme.1 for ; Sat, 26 Sep 2020 14:04:28 -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=OGsfOc3S0PE/4vkc7IqrM3gcS0GA+iGg6M6p3MVsdaw=; b=gbPqtycLV8k/slggHduieKihk52jlphslsytcJAcb6QoZOTYzylVq8gqldZqiC04ft IUMbO0/o2itFBUuiDbN7mhnKqjB7YybQ0RmRfdck9Y+8frPVEuBnwS5LweQfduTOOxMW wRT53Pg3Tz7kfsvUJ2QhpatuAcFOgCWnhcIoNTr8lZNq8+lQJDO/9kgS20KmYAID2H7W dOI/2fB78xvwVbZz+dXr399Jbf/tkc3zRFIEbJjgpi2l3aExqSpT4DH5AuLdZIfx4O+t t6ZrjLa4U3TJxkcKc1LsrLByx8PLkoZrhYA9RwxUePZaT+VWk/wmxH4Y5MD+X7EfRLem JeDQ== 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=OGsfOc3S0PE/4vkc7IqrM3gcS0GA+iGg6M6p3MVsdaw=; b=pC0yqvIgiYEw0oO1qeeVUDTNMmGOErB1RS2h0mgi7tvbdvIMxEnl4XEsMliexIFRPj +xfgiUbWEC1T39x8sliDXmYJ/KO5H5qedMGzNB3bY8o4eUcQZOldZkLffbek2OIlqN97 TAQSWZNHDWW5nd7JRD2DXmEA+NEbOw823OLLZEZxXwAqVjdSd4gH+x4L5hmFyVe8Qsuo cDzcmISxaPU30PzwxNsrjOxeohPZNe1JyVs6zsV7iGZ9Q1NX+S7qdNl0tRZA+vnomYCA WkK680GuVQ7gYVi45PIFwn8edc9QWBji6h3qYUhH3RGOKfcrtXWgfR3goGIeRRbEy7B9 j2vA== X-Gm-Message-State: AOAM532yAg+FltP9rWsBVD+ukLCE44VYVYfi68McCIMS3bO0OUpwEzos ZoWYD+S7nnkIfWPkhzYrZWuQs8QDu5U= X-Google-Smtp-Source: ABdhPJyPiquTMjCciiFSIOPQDenJyL8H5nxKHrjlsQdDq9RKW/e/Yhnfm/Av6ZE/7utyjpF6ftZkGg== X-Received: by 2002:a7b:c345:: with SMTP id l5mr3973767wmj.123.1601154265776; Sat, 26 Sep 2020 14:04:25 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id v2sm7487689wrm.16.2020.09.26.14.04.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2020 14:04:25 -0700 (PDT) Message-Id: <8d8e9abfe2ad141a75ee54446393f8b54b1fb990.1601154262.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Date: Sat, 26 Sep 2020 21:04:20 +0000 Subject: [PATCH v3 3/5] t3200: avoid variations of the `master` branch name Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Jeff King , Johannes Schindelin , Johannes Schindelin , Johannes Schindelin 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. While at it, make those branch names independent from the default branch name. In this particular instance, this rename 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..cc27e3bfdb 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 topic topic should work when master is checked out' ' git checkout master && - git branch master2 && - git branch -M master2 master2 + git branch topic && + git branch -M topic topic ' 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 * master n o/p r + abc bar j/k m/m mb o/o q topic EOF test_cmp expect actual ' @@ -346,13 +346,13 @@ test_expect_success 'git branch --column with an extremely long branch name' ' l m/m * master - master2 mb n o/o o/p q r + topic $long EOF test_cmp expect actual @@ -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 * master n o/p r + abc bar j/k m/m mb o/o q topic 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 @@ -389,13 +389,13 @@ test_expect_success 'git branch -v with column.ui ignored' ' l m/m * master - master2 mb n o/o o/p q r + topic EOF test_cmp expect actual ' @@ -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/topic refs/heads/master && + test_must_fail git branch -m topic new-topic && + git symbolic-ref refs/heads/topic && test_path_is_file .git/refs/heads/master && - test_path_is_missing .git/refs/heads/master3 + test_path_is_missing .git/refs/heads/new-topic ' test_expect_success SYMLINKS 'git branch -m u v should fail when the reflog for u is a symlink' '