From patchwork Mon Nov 9 00:09:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 11890069 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 88862C4741F for ; Mon, 9 Nov 2020 00:09:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2E611206E3 for ; Mon, 9 Nov 2020 00:09:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KUoo0VTL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728767AbgKIAJa (ORCPT ); Sun, 8 Nov 2020 19:09:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727929AbgKIAJa (ORCPT ); Sun, 8 Nov 2020 19:09:30 -0500 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E051FC0613CF for ; Sun, 8 Nov 2020 16:09:29 -0800 (PST) Received: by mail-wr1-x442.google.com with SMTP id 33so6927193wrl.7 for ; Sun, 08 Nov 2020 16:09:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=aDfPuk+7Osh3haffc1KnOAva1PGvlVM+3ARSieYjBqk=; b=KUoo0VTLOfYQI81t6vRlC5PgFK4DhYRZabIN/70f+Z1F0gSjsUZ59GoeapVqYDw8zd D07MPN6Ugc7u9GB2FK9umjhUzINZ4+J76XaMVEweZs133ySZc7jz5S2O8tNUWLTkhxI0 PDuZpg2q/AmJzokBHUMeqJga4csIumtE3xwewvcOakP4sfNf40yst6s1VPpTGZyEIOPS uKyU2zU2GiTqvEcUl3vnvJGLnaGYWD6FCJzbImvzoCzDYSbE6gYgDa7Wa1FC2LwGz+fT D1vRIu0jHibG3InagUq1DmLeJR9BaXbRGYMRhoMMc8fnKgfoIZ/Cyr3hawWupSEm31os VWEg== 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=aDfPuk+7Osh3haffc1KnOAva1PGvlVM+3ARSieYjBqk=; b=EYNgTG4+jCdeiMLI0IDCvlv7Q3HKKy99hfsHPQnOVpGC5AIC3JmV6+BBFs/PYh8Pm9 EEOb6xG9MZMK6mIQwct8QudInN2aaV87VAqNpl5QP9Y/de2UeLPYpOAxIdnISVUcybnm p1XTmuPFD+PhvHmGJ3DvFNA3Iq9JWZ/LU+qtRfSgBNdIFu3HbwtrTbkFC+cB32QxJB/L MmH5an4MTVdWtrqI6W8Qr5LO35scO3bHk5zB6PGfcRINMjwPUHPHN8eKRSPtEdr3SBiK WjYhHCkiSXZ2fYih13WkDJ9OhmKdttab2Kertt52ukx146+vxwRGYE7i+jN/YnCuzMfT G+Ig== X-Gm-Message-State: AOAM533GK2bKCXET+Gf1re1G0jEUn+973bx+9DJdbc/StBFmZ73SAq/N Xs2ve1fRywMi61ZuaBUEcZmXd2I1m4s= X-Google-Smtp-Source: ABdhPJy9QP/u2kx0w2H+85EfQ+eLXkQdISE5KUuCgMaBlW8BLsPIvS9AdqdNPWb0BgJw/Sb29XViNg== X-Received: by 2002:a05:6000:10e:: with SMTP id o14mr15186951wrx.225.1604880568168; Sun, 08 Nov 2020 16:09:28 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id x6sm4309530wmc.48.2020.11.08.16.09.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 16:09:27 -0800 (PST) Message-Id: <1db6df30031bd13e3e01fe23a957c6841b9c1bf1.1604880565.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 09 Nov 2020 00:09:20 +0000 Subject: [PATCH 1/6] t1004: insert missing "branch" in a message Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin The message in question reads awkward with the name "master", but will be even more confusing once that is renamed to "main". Let's adjust it in advance of said rename. Signed-off-by: Johannes Schindelin --- t/t1004-read-tree-m-u-wf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh index c13578a635..181956b241 100755 --- a/t/t1004-read-tree-m-u-wf.sh +++ b/t/t1004-read-tree-m-u-wf.sh @@ -20,7 +20,7 @@ test_expect_success 'two-way setup' ' git branch side && git tag -f branch-point && - echo file2 is not tracked on the master anymore && + echo file2 is not tracked on the master branch anymore && rm -f file2 subdir/file2 && git update-index --remove file2 subdir/file2 && git commit -a -m "master removes file2 and subdir/file2" From patchwork Mon Nov 9 00:09:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 11890077 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 80218C388F9 for ; Mon, 9 Nov 2020 00:09:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 27646206E3 for ; Mon, 9 Nov 2020 00:09:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YPEGSd/B" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728934AbgKIAJb (ORCPT ); Sun, 8 Nov 2020 19:09:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728104AbgKIAJb (ORCPT ); Sun, 8 Nov 2020 19:09:31 -0500 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 E0442C0613CF for ; Sun, 8 Nov 2020 16:09:30 -0800 (PST) Received: by mail-wm1-x343.google.com with SMTP id v5so6468219wmh.1 for ; Sun, 08 Nov 2020 16:09:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=ygeWu2tMnyx/kWndfQ7auYIYsgjr2fB0FuQj+dvcbRs=; b=YPEGSd/BySAdcqLAqPRhVA/SpEkgqqrZPV5K5MYvHmBXiLo5ewX5Cd+kS5NVYSzPRN TiwGO5UaEusdPWLk+FyfH4kda+xv0SU4VOoXeTXxzqLrD2uRlWrjX2DeZgV4ymLNHTOk zu0EdUiBRWkrT8FuW1/9cfN7HeNsopqdvOfdz821yRw7B5iQLoITO0jAB3tP6a4g0ZUV tWZQaz00qnLGRQ8okggsyGoTnhTPEH8n3HZJj8KRefxv2yxoJ+dBLzIxe3k3J3UJi06+ j7fX2uh5sjRogX4o0mLLafLQEls3dEJ8W2Uu3WVpxJLngGhNcCfPL2VQydSSUT3Fa30a Uyyw== 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=ygeWu2tMnyx/kWndfQ7auYIYsgjr2fB0FuQj+dvcbRs=; b=sTlZNnhIBGU/9wenI4jPEA8WPy59LvMfd8KtG2ZhXyfo6vQZHJWIDKWYvUl0QCLxDm UWaVqc/rJO87wUEPXPYzonmD6FVTXggIkceMDbTofInOoHJ9v5++n86HH87ST0+OodCH C+eKhITXD6Tn3KuJJczCKoymMIxAR3pEzlA6Bjrln+OWband8qWvaRGRf/JychBhY1VV 5kKGPutGyEGB9mlcRBqdUv+eIm6zT5dKQeXe2dwv1OMG//Cra/EjMivz3pvX1lM5lqTu jDpwWP1StuYBpql/0u59Bj3qzC8d9Dq7ARn2u/g72ghc8a19OvNqEhPnioLWoJK7qsVS /bfQ== X-Gm-Message-State: AOAM5324G20HmP0EURAl5Hh/begZ5Woe7UvlkYn18qKceZNdFGhUnYRh +Gzi661InCU9aqYBNhJLSPQtpxctrtA= X-Google-Smtp-Source: ABdhPJz8tdM6U4Umr8H/3L4vPTFudHax0wYHq6NI+7gmoAXLPv5whdHr1AgbRGucPZZzqaPygzbdHQ== X-Received: by 2002:a1c:b0c8:: with SMTP id z191mr10991029wme.99.1604880569479; Sun, 08 Nov 2020 16:09:29 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n6sm11465673wrj.60.2020.11.08.16.09.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 16:09:29 -0800 (PST) Message-Id: <1340feb2dfceaf9215495af2fd970d30866f7a76.1604880565.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 09 Nov 2020 00:09:22 +0000 Subject: [PATCH 3/6] t3427: adjust stale comment Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin In b6211b89eb3 (tests: avoid variations of the `master` branch name, 2020-09-26), the `master[123]` branch names were renamed to `topic_[123]`. A non-literal mention of the corresponding files was missed in that commit. Signed-off-by: Johannes Schindelin --- t/t3427-rebase-subtree.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh index 2a7d958ea7..5839719ba1 100755 --- a/t/t3427-rebase-subtree.sh +++ b/t/t3427-rebase-subtree.sh @@ -19,7 +19,7 @@ commit_message() { # \ # README ---------------------- Add subproject master - topic_4 - files_subtree/topic_5 # -# Where the merge moves the files master[123].t into the subdirectory +# Where the merge moves the files topic_[123].t into the subdirectory # files_subtree/ and topic_4 as well as files_subtree/topic_5 add files to that # directory directly. # From patchwork Mon Nov 9 00:09:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 11890071 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 3F5DBC388F9 for ; Mon, 9 Nov 2020 00:09:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CF9C3206E3 for ; Mon, 9 Nov 2020 00:09:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dtCc2m/n" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728973AbgKIAJe (ORCPT ); Sun, 8 Nov 2020 19:09:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728942AbgKIAJc (ORCPT ); Sun, 8 Nov 2020 19:09:32 -0500 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C49AEC0613CF for ; Sun, 8 Nov 2020 16:09:31 -0800 (PST) Received: by mail-wr1-x433.google.com with SMTP id p1so6915130wrf.12 for ; Sun, 08 Nov 2020 16:09:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=pif9dbkJ+jB0ovKVxg1H2OhOFDFrN0mVs7u6W61rMRA=; b=dtCc2m/n7qz+r/Dn0ZqN4+nUfl5r+A/gZo79yZdwlpYmHh7tWQnZDZNAilNOiJsEwK d9Upaq47OpERmQT59kaS9q0JGbDQTGQ5WfjOtaHYJzhdMgpxWP+CTC2sQF4cHox3ETbI KsJ4tbGpEG/ynDfpSfc9brwWbdSrP7AZEi2EJySl2c8PwJTaHq1CgUkm+vVSf5PrwCQt 544mOOUDv1YmEHuy3NTOO0jDGPZpo/510q7LqDlwgrGJejgjcx5fW2ToWVbrMdwt5+CO Aj3wEITi5xqKToPCmQfHvDlFQBr1X+Hlb2zPmHw+5u+vt/k7HT9aYLCWWuV8+5w9Vc72 j3fw== 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=pif9dbkJ+jB0ovKVxg1H2OhOFDFrN0mVs7u6W61rMRA=; b=l4QpWg2C/IFpi4+AfuuhnIX5ok8FhUAFyW+bQJrK4iIqv7o28rSJTN3mA9ZHKQXFA7 gaIbC+TMJMrbl25C0xb2b5s9+y3Zef3L0a1EF6kPwQGi05P9uh3uA1NccGTY28Uv17sQ tcemV1FDjYabWbtC/J+V+Uw5C/8/tu3Tgxk2tMkaPumtq7x4jQKqRXjVaJjTGf4f4zRn 8aZsqNRys2H6cy5hHzbEusV3SMJBEy0NqZfY+G1FnwAyjtGMC1kU7uNqT2P6BkDqIj2d IVrXrDPWemf9HsUyKQmvJ/RPx4OaOVD+zhkIiVckEgHiZa//UJQYqRHLau1x4dG3fcD7 Fd9A== X-Gm-Message-State: AOAM5312opY/D0WiMPZyvBH5+ra9o5QGlrXiasrVLwOEM+82hWagjN65 hvy/D2wA4USuYBVUM3JmPGERHagdjwo= X-Google-Smtp-Source: ABdhPJzIocysW29aSt7WAh868hBig47O8IURsRMHe4zz6msXFNz+5EraBns7vNRu4iWeUSaKufZAOQ== X-Received: by 2002:a5d:4104:: with SMTP id l4mr14070655wrp.276.1604880570281; Sun, 08 Nov 2020 16:09:30 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y10sm11219311wru.94.2020.11.08.16.09.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 16:09:29 -0800 (PST) Message-Id: In-Reply-To: References: Date: Mon, 09 Nov 2020 00:09:23 +0000 Subject: [PATCH 4/6] t5400,t5402: consistently indent with tabs, not with spaces Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin This patch actually prepares for the upcoming patches to replace `master` with `main` in these tests: we do not want those changes to be flagged by the new `check-whitespace` GitHub workflow (even if those changes do not introduce the whitespace issues, they touch lines affected by those issues without fixing them). Signed-off-by: Johannes Schindelin --- t/t5400-send-pack.sh | 153 +++++++++++++++++++------------------ t/t5402-post-merge-hook.sh | 16 ++-- 2 files changed, 85 insertions(+), 84 deletions(-) diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh index b84618c925..cc86ef213e 100755 --- a/t/t5400-send-pack.sh +++ b/t/t5400-send-pack.sh @@ -21,14 +21,15 @@ test_expect_success setup ' i=0 && while test $i -le $cnt do - i=$(($i+1)) && - test_tick && - echo "Commit #$i" >mozart/is/pink && - git update-index --add mozart/is/pink && - tree=$(git write-tree) && - commit=$(echo "Commit #$i" | git commit-tree $tree -p $parent) && - git update-ref refs/tags/commit$i $commit && - parent=$commit || return 1 + i=$(($i+1)) && + test_tick && + echo "Commit #$i" >mozart/is/pink && + git update-index --add mozart/is/pink && + tree=$(git write-tree) && + commit=$(echo "Commit #$i" | + git commit-tree $tree -p $parent) && + git update-ref refs/tags/commit$i $commit && + parent=$commit || return 1 done && git update-ref HEAD "$commit" && git clone ./. victim && @@ -38,14 +39,14 @@ test_expect_success setup ' i=0 && while test $i -le $cnt do - i=$(($i+1)) && - test_tick && - echo "Rebase #$i" >mozart/is/pink && - git update-index --add mozart/is/pink && - tree=$(git write-tree) && - commit=$(echo "Rebase #$i" | git commit-tree $tree -p $parent) && - git update-ref refs/tags/rebase$i $commit && - parent=$commit || return 1 + i=$(($i+1)) && + test_tick && + echo "Rebase #$i" >mozart/is/pink && + git update-index --add mozart/is/pink && + tree=$(git write-tree) && + commit=$(echo "Rebase #$i" | git commit-tree $tree -p $parent) && + git update-ref refs/tags/rebase$i $commit && + parent=$commit || return 1 done && git update-ref HEAD "$commit" && echo Rebase && @@ -57,11 +58,11 @@ test_expect_success 'pack the source repository' ' ' test_expect_success 'pack the destination repository' ' - ( - cd victim && - git repack -a -d && - git prune - ) + ( + cd victim && + git repack -a -d && + git prune + ) ' test_expect_success 'refuse pushing rewound head without --force' ' @@ -85,10 +86,10 @@ test_expect_success 'push can be used to delete a ref' ' test_expect_success 'refuse deleting push with denyDeletes' ' ( - cd victim && - test_might_fail git branch -D extra && - git config receive.denyDeletes true && - git branch extra master + cd victim && + test_might_fail git branch -D extra && + git config receive.denyDeletes true && + git branch extra master ) && test_must_fail git send-pack ./victim :extra master ' @@ -118,9 +119,9 @@ test_expect_success 'override denyDeletes with git -c receive-pack' ' test_expect_success 'denyNonFastforwards trumps --force' ' ( - cd victim && - test_might_fail git branch -D extra && - git config receive.denyNonFastforwards true + cd victim && + test_might_fail git branch -D extra && + git config receive.denyNonFastforwards true ) && victim_orig=$(cd victim && git rev-parse --verify master) && test_must_fail git send-pack --force ./victim master^:master && @@ -143,16 +144,16 @@ test_expect_success 'send-pack --all sends all branches' ' test_expect_success 'push --all excludes remote-tracking hierarchy' ' mkdir parent && ( - cd parent && - git init && : >file && git add file && git commit -m add + cd parent && + git init && : >file && git add file && git commit -m add ) && git clone parent child && ( - cd child && git push --all + cd child && git push --all ) && ( - cd parent && - test -z "$(git for-each-ref refs/remotes/origin)" + cd parent && + test -z "$(git for-each-ref refs/remotes/origin)" ) ' @@ -160,33 +161,33 @@ test_expect_success 'receive-pack runs auto-gc in remote repo' ' rm -rf parent child && git init parent && ( - # Setup a repo with 2 packs - cd parent && - echo "Some text" >file.txt && - git add . && - git commit -m "Initial commit" && - git repack -adl && - echo "Some more text" >>file.txt && - git commit -a -m "Second commit" && - git repack + # Setup a repo with 2 packs + cd parent && + echo "Some text" >file.txt && + git add . && + git commit -m "Initial commit" && + git repack -adl && + echo "Some more text" >>file.txt && + git commit -a -m "Second commit" && + git repack ) && cp -R parent child && ( - # Set the child to auto-pack if more than one pack exists - cd child && - git config gc.autopacklimit 1 && - git config gc.autodetach false && - git branch test_auto_gc && - # And create a file that follows the temporary object naming - # convention for the auto-gc to remove - : >.git/objects/tmp_test_object && - test-tool chmtime =-1209601 .git/objects/tmp_test_object + # Set the child to auto-pack if more than one pack exists + cd child && + git config gc.autopacklimit 1 && + git config gc.autodetach false && + git branch test_auto_gc && + # And create a file that follows the temporary object naming + # convention for the auto-gc to remove + : >.git/objects/tmp_test_object && + test-tool chmtime =-1209601 .git/objects/tmp_test_object ) && ( - cd parent && - echo "Even more text" >>file.txt && - git commit -a -m "Third commit" && - git send-pack ../child HEAD:refs/heads/test_auto_gc + cd parent && + echo "Even more text" >>file.txt && + git commit -a -m "Third commit" && + git send-pack ../child HEAD:refs/heads/test_auto_gc ) && test ! -e child/.git/objects/tmp_test_object ' @@ -195,15 +196,15 @@ rewound_push_setup() { rm -rf parent child && mkdir parent && ( - cd parent && - git init && - echo one >file && git add file && git commit -m one && - git config receive.denyCurrentBranch warn && - echo two >file && git commit -a -m two + cd parent && + git init && + echo one >file && git add file && git commit -m one && + git config receive.denyCurrentBranch warn && + echo two >file && git commit -a -m two ) && git clone parent child && ( - cd child && git reset --hard HEAD^ + cd child && git reset --hard HEAD^ ) } @@ -211,16 +212,16 @@ test_expect_success 'pushing explicit refspecs respects forcing' ' rewound_push_setup && parent_orig=$(cd parent && git rev-parse --verify master) && ( - cd child && - test_must_fail git send-pack ../parent \ - refs/heads/master:refs/heads/master + cd child && + test_must_fail git send-pack ../parent \ + refs/heads/master:refs/heads/master ) && parent_head=$(cd parent && git rev-parse --verify master) && test "$parent_orig" = "$parent_head" && ( - cd child && - git send-pack ../parent \ - +refs/heads/master:refs/heads/master + cd child && + git send-pack ../parent \ + +refs/heads/master:refs/heads/master ) && parent_head=$(cd parent && git rev-parse --verify master) && child_head=$(cd child && git rev-parse --verify master) && @@ -231,16 +232,16 @@ test_expect_success 'pushing wildcard refspecs respects forcing' ' rewound_push_setup && parent_orig=$(cd parent && git rev-parse --verify master) && ( - cd child && - test_must_fail git send-pack ../parent \ - "refs/heads/*:refs/heads/*" + cd child && + test_must_fail git send-pack ../parent \ + "refs/heads/*:refs/heads/*" ) && parent_head=$(cd parent && git rev-parse --verify master) && test "$parent_orig" = "$parent_head" && ( - cd child && - git send-pack ../parent \ - "+refs/heads/*:refs/heads/*" + cd child && + git send-pack ../parent \ + "+refs/heads/*:refs/heads/*" ) && parent_head=$(cd parent && git rev-parse --verify master) && child_head=$(cd child && git rev-parse --verify master) && @@ -250,8 +251,8 @@ test_expect_success 'pushing wildcard refspecs respects forcing' ' test_expect_success 'deny pushing to delete current branch' ' rewound_push_setup && ( - cd child && - test_must_fail git send-pack ../parent :refs/heads/master 2>errs + cd child && + test_must_fail git send-pack ../parent :refs/heads/master 2>errs ) ' @@ -289,7 +290,7 @@ test_expect_success 'receive-pack de-dupes .have lines' ' EOF GIT_TRACE_PACKET=$(pwd)/trace GIT_TEST_PROTOCOL_VERSION=0 \ - git push \ + git push \ --receive-pack="unset GIT_TRACE_PACKET; git-receive-pack" \ fork HEAD:foo && extract_ref_advertisement refs && diff --git a/t/t5402-post-merge-hook.sh b/t/t5402-post-merge-hook.sh index 6eb2ffd6ec..4aeea8f5b7 100755 --- a/t/t5402-post-merge-hook.sh +++ b/t/t5402-post-merge-hook.sh @@ -15,7 +15,7 @@ test_expect_success setup ' git update-index a && tree1=$(git write-tree) && commit1=$(echo modify | git commit-tree $tree1 -p $commit0) && - git update-ref refs/heads/master $commit0 && + git update-ref refs/heads/master $commit0 && git clone ./. clone1 && GIT_DIR=clone1/.git git update-index --add a && git clone ./. clone2 && @@ -23,34 +23,34 @@ test_expect_success setup ' ' for clone in 1 2; do - cat >clone${clone}/.git/hooks/post-merge <<'EOF' + cat >clone${clone}/.git/hooks/post-merge <<'EOF' #!/bin/sh echo $@ >> $GIT_DIR/post-merge.args EOF - chmod u+x clone${clone}/.git/hooks/post-merge + chmod u+x clone${clone}/.git/hooks/post-merge done test_expect_success 'post-merge does not run for up-to-date ' ' - GIT_DIR=clone1/.git git merge $commit0 && + GIT_DIR=clone1/.git git merge $commit0 && ! test -f clone1/.git/post-merge.args ' test_expect_success 'post-merge runs as expected ' ' - GIT_DIR=clone1/.git git merge $commit1 && + GIT_DIR=clone1/.git git merge $commit1 && test -e clone1/.git/post-merge.args ' test_expect_success 'post-merge from normal merge receives the right argument ' ' - grep 0 clone1/.git/post-merge.args + grep 0 clone1/.git/post-merge.args ' test_expect_success 'post-merge from squash merge runs as expected ' ' - GIT_DIR=clone2/.git git merge --squash $commit1 && + GIT_DIR=clone2/.git git merge --squash $commit1 && test -e clone2/.git/post-merge.args ' test_expect_success 'post-merge from squash merge receives the right argument ' ' - grep 1 clone2/.git/post-merge.args + grep 1 clone2/.git/post-merge.args ' test_done From patchwork Mon Nov 9 00:09:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 11890079 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 E423DC56201 for ; Mon, 9 Nov 2020 00:09:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8D4CC2065C for ; Mon, 9 Nov 2020 00:09:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hUbWRlZR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728985AbgKIAJf (ORCPT ); Sun, 8 Nov 2020 19:09:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728104AbgKIAJc (ORCPT ); Sun, 8 Nov 2020 19:09:32 -0500 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66D6FC0613D2 for ; Sun, 8 Nov 2020 16:09:32 -0800 (PST) Received: by mail-wr1-x444.google.com with SMTP id d12so5419623wrr.13 for ; Sun, 08 Nov 2020 16:09:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=Y1oFvLY79Y+IPC1A0oWToPGsDkgwKy+ndXSoYdS6MDs=; b=hUbWRlZROsh45h2PiWLSTj4lIDDHqFTwfNgT6GZgo1VlrqS7IKK1G0kTLliGu6+3m9 vzk6onAnMadCNgivD13TwGN5eTVP2SCSsNdOyxDjYlL+ccb60jt7pyh7wFmXQnqgkkon MrQ71XBmB7t365jfOOas8yxbDv4h89jNpHIma+GKY+nrkySFvMbx5cQa9xRkjqFb9sC+ G0mKHQDRgntT+IyB1uTTbL62AXGfHvY+2+qdjTAjSEp4X8q20Hwxc9Zt5zKbBoPWCoY7 YbCbJF/Y+ZJ0ekATXXwoBTwDj2DstYbuePyLX/Xi3rTlifHjPh9jWU8PfyOlMbrzXtRW 0KMw== 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=Y1oFvLY79Y+IPC1A0oWToPGsDkgwKy+ndXSoYdS6MDs=; b=D5Ckq2E7w0ONPxtVvSmKe/WbHX/kW5w28MPoTvzefbaqnVYOmNd+p+VwwMzUiw2V+c rrzVEOCJ41eoq8ifKjSIWoPnXfA0IdDoIog/OJHqGV+uUUkowCPh/dX9DdBshoFgIU50 dxXmjr+fV8MLYWW7Z94dszc4euzM0qjZn1VtbbMzENbJND2138T3NHT7VfPAcfdYeZfx uIfqS6Ar8hKH/8GJ0k8cEc7LT69+q3eQz4ws5jan4iKyr7V5QL0FdCT4bhEvMp7jqD7O Qcndtux0dE+Ew9d8JfzfyDsKNPNe00NPmpNA26hV/OoLW6qLJPc3bNNnw4CZrD22/JuW dyig== X-Gm-Message-State: AOAM532EJTyNH+G0jbpj21Ps+saL/xYiL5o7tPvbGVCk+bm4oIBJXoRB UYXbfAZaajEzk/Bv8S9WraFQKxUnVBo= X-Google-Smtp-Source: ABdhPJxxK0O2VcSEleSlIMiZuCEK2kSXc+KgohkDsf86l4B35+6BC8bo58ZUh5Vj4Y4vWckdNHtS4A== X-Received: by 2002:adf:cd81:: with SMTP id q1mr15707769wrj.410.1604880571077; Sun, 08 Nov 2020 16:09:31 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n10sm968045wrv.77.2020.11.08.16.09.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 16:09:30 -0800 (PST) Message-Id: In-Reply-To: References: Date: Mon, 09 Nov 2020 00:09:24 +0000 Subject: [PATCH 5/6] t5570: remove trailing padding Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin Two blocks in t5570 want to align the closing double quotes, padding with spaces if needed. Since the maximum length of those lines is defined by the branch name `master`, the upcoming rename to `main` would unalign the quotes. But then, it is unclear how those aligned closing quotes should help readability anyway, so let's just remove that padding altogether. Signed-off-by: Johannes Schindelin --- t/t5570-git-daemon.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh index 34487bbb8c..8f69a7854f 100755 --- a/t/t5570-git-daemon.sh +++ b/t/t5570-git-daemon.sh @@ -147,18 +147,18 @@ test_remote_error() } msg="access denied or repository not exported" -test_expect_success 'clone non-existent' "test_remote_error '$msg' clone nowhere.git " +test_expect_success 'clone non-existent' "test_remote_error '$msg' clone nowhere.git" test_expect_success 'push disabled' "test_remote_error '$msg' push repo.git master" -test_expect_success 'read access denied' "test_remote_error -x '$msg' fetch repo.git " -test_expect_success 'not exported' "test_remote_error -n '$msg' fetch repo.git " +test_expect_success 'read access denied' "test_remote_error -x '$msg' fetch repo.git" +test_expect_success 'not exported' "test_remote_error -n '$msg' fetch repo.git" stop_git_daemon start_git_daemon --informative-errors -test_expect_success 'clone non-existent' "test_remote_error 'no such repository' clone nowhere.git " +test_expect_success 'clone non-existent' "test_remote_error 'no such repository' clone nowhere.git" test_expect_success 'push disabled' "test_remote_error 'service not enabled' push repo.git master" -test_expect_success 'read access denied' "test_remote_error -x 'no such repository' fetch repo.git " -test_expect_success 'not exported' "test_remote_error -n 'repository not exported' fetch repo.git " +test_expect_success 'read access denied' "test_remote_error -x 'no such repository' fetch repo.git" +test_expect_success 'not exported' "test_remote_error -n 'repository not exported' fetch repo.git" stop_git_daemon start_git_daemon --interpolated-path="$GIT_DAEMON_DOCUMENT_ROOT_PATH/%H%D" From patchwork Mon Nov 9 00:09:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 11890075 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 BA83BC4741F for ; Mon, 9 Nov 2020 00:09:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6A098206E3 for ; Mon, 9 Nov 2020 00:09:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CfKvXDAh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728996AbgKIAJh (ORCPT ); Sun, 8 Nov 2020 19:09:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728967AbgKIAJd (ORCPT ); Sun, 8 Nov 2020 19:09:33 -0500 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30E15C0613CF for ; Sun, 8 Nov 2020 16:09:33 -0800 (PST) Received: by mail-wm1-x32e.google.com with SMTP id h2so6465353wmm.0 for ; Sun, 08 Nov 2020 16:09:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=e+P8QtsE0WM2oN3AdRdV0QxVBvrikAj4f06yxaLtYR0=; b=CfKvXDAhukdJUe+RKVNBTZeQkgFM549Ftx5vj7r+gJMJk/1RS1ID6yJs/oFEXCUNjt vQQsHcAG6QNCX1V8LhiQergLFzTM8e7Yf1yEj4WQPa67Q6n8tXYCOnIOx0kMh+0BcQe5 dcxBKelJDOVcaiQqMNUprZ4ME0Ebo+bZPHgOE7VMd6BvjOsZwQsUhqZ2PyuVgyXZvbx5 bdX5YCqtrPgUqYZAN4OaAJBkEfSgR6FzxOPWX9q3XK03TGgmbITJlKaI9yexiZ7AHrVZ DLaKx1blOEHjHzv15z7Y41xdPJy3xftdSTPkpXdfERmas84QzxzNJa7AhOzuY/wbQcQT 1f1g== 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=e+P8QtsE0WM2oN3AdRdV0QxVBvrikAj4f06yxaLtYR0=; b=QaXV6QbFmubCzrWXgnFeH8GFuQxwtX0jwAhRziX1Lz0oARkOW2WEmNmWcXb9MhUWLS Za5h/q5UUQ0vl10XceUYE7Ez0zhF/RqvpuArx4Qd+FZU57LxfVZ5mO0Jtt9lxkK8Gy3O HZvA2d5pfWbMuPFslMcLxasK8gLnjgPyrwJ2RG4AafGPWULm6lh1XRpee92/bH3MHwpE FOUMqmyWJem2UsBDPtTTEkSC715sEe74+ZdBa9GWWPi06FMrBclz6qInaMnju3cfs0Cq BYuwfbElm9ZWl/Zo9TVus9aXcDRFp1PX9YlLzPfbH0xW+8ZjnZ46WQRB/SsrTD+Z8UvQ goQQ== X-Gm-Message-State: AOAM530C14CNvirDwpqyt8S8hyI3DHL8urKtaAqQBoJO4YufqNHo5w75 XJ/ztqYPWcb/WYk3Yxu+aHzvry51yQw= X-Google-Smtp-Source: ABdhPJyZHBodLVUZrupJTIUa/HHZCpxvrhiEilAAAI7qyOQn8HhsRTbl/NmJulyNoM5Zpi23f/pybw== X-Received: by 2002:a1c:c2c3:: with SMTP id s186mr11868354wmf.160.1604880571819; Sun, 08 Nov 2020 16:09:31 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id k81sm12906568wma.2.2020.11.08.16.09.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 16:09:31 -0800 (PST) Message-Id: <36ed176a4e0ca19a38f1fb968ac8bac83a288fd4.1604880566.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 09 Nov 2020 00:09:25 +0000 Subject: [PATCH 6/6] t9603: use tabs for indentation Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin This patch will let the new `check-whitespace` GitHub workflow be happy with the upcoming patch series that wants to search-and-replace `master` with `main` in t9603 and some other test scripts. Signed-off-by: Johannes Schindelin --- t/t9603-cvsimport-patchsets.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh index 3e64b11eac..e7a91611dc 100755 --- a/t/t9603-cvsimport-patchsets.sh +++ b/t/t9603-cvsimport-patchsets.sh @@ -17,23 +17,23 @@ test_description='git cvsimport testing for correct patchset estimation' setup_cvs_test_repository t9603 test_expect_failure PERL 'import with criss cross times on revisions' ' - - git cvsimport -p"-x" -C module-git module && - (cd module-git && - git log --pretty=format:%s > ../actual-master && - git log A~2..A --pretty="format:%s %ad" -- > ../actual-A && - echo "" >> ../actual-master && - echo "" >> ../actual-A - ) && - echo "Rev 4 + git cvsimport -p"-x" -C module-git module && + ( + cd module-git && + git log --pretty=format:%s > ../actual-master && + git log A~2..A --pretty="format:%s %ad" -- > ../actual-A && + echo "" >> ../actual-master && + echo "" >> ../actual-A + ) && + echo "Rev 4 Rev 3 Rev 2 Rev 1" > expect-master && - test_cmp expect-master actual-master && + test_cmp expect-master actual-master && - echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000 + echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000 Rev 4 Branch A Wed Mar 11 19:03:52 2009 +0000" > expect-A && - test_cmp expect-A actual-A + test_cmp expect-A actual-A ' test_done