From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id B37DF20248 for ; Thu, 18 Apr 2019 13:16:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388681AbfDRNQl (ORCPT ); Thu, 18 Apr 2019 09:16:41 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:43567 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388369AbfDRNQk (ORCPT ); Thu, 18 Apr 2019 09:16:40 -0400 Received: by mail-ed1-f67.google.com with SMTP id j20so1756571edq.10 for ; Thu, 18 Apr 2019 06:16:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:mime-version :content-transfer-encoding:fcc:content-transfer-encoding:to:cc; bh=fsRXmxsHknzStyOSzfru5tYTFJds2VIn7azXyKABgfM=; b=iUDQJrYWJJp/evTDnPW3pN+K/tbpA6JN12GAnFkoGQFgK+68NiLuXq8MG9MTZA99F1 w1DcEADKt1adhdeBQxX61X7JgFACeWb2B4/TNOzYLl2s6FdvWb5wngjnxS4a4Att7dtv JeW6mGHjx2/QEVvXVCKbModTcDKai6WfGsJ0uSzKjGwGF2Ftr/Fa/c0EgcRB2efmm78v Beakki6gGrf4VCvPdtbMD5LvDzaICPNlFvZ6j+3q/M9mKmmN+V2Q1t639wDswwWh/OUY 0yPcOgjXE/wcLIwhlOdKiShqjthiDRl+t+4B3MinNJqYCOvdFFiMrvVRXbqAzJ4GpPy/ WCOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:mime-version:content-transfer-encoding:fcc :content-transfer-encoding:to:cc; bh=fsRXmxsHknzStyOSzfru5tYTFJds2VIn7azXyKABgfM=; b=tFfxF7feHzfINdCIp7fhBbDTi6gy7NiY1WyXYIijmnSSXU2wuMJeAPdIn/6so9RmCv CqzHYhcWqSMYptr8M+MOr/RRHc4BsPQot+u5uUIyQRpxNoH0234Lz82cDBIT7Lk1w5ps AxfhK2CSgsmR6IU6yGPEW4nFhDCJGVGeEA0ELEp+4+QebPXBdnsvP0V2Cii0nvterpq8 zbnH76bN0n2rXiDk17RQzpCTrjwcKLvFd2W8nNCVIE2c7/7bwnB4ebYDuqUart9h5yG4 PtIzvmN3iopaSGgAUL19OfU0fttvJqlYn7y7iWTjLNMr8aqpuAxZBvhDdW9FJiA9UpBy zPPg== X-Gm-Message-State: APjAAAUs9ZKF17ezsEzBgPNnlmfWhRMowm0IosZcNAg5ncsetArGDxTz SPQEgByJ1sXEBkumoYoA68GegkVU X-Google-Smtp-Source: APXvYqxb3ZoWv3RCmmzgPqZrAJYBZx6tXNvyC/g2eFWj+8/sSm+J2lTosUXhH5UMAhKaMPmbtJds6Q== X-Received: by 2002:a50:9317:: with SMTP id m23mr11123008eda.114.1555593399026; Thu, 18 Apr 2019 06:16:39 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id s13sm378962eju.89.2019.04.18.06.16.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Apr 2019 06:16:38 -0700 (PDT) Date: Thu, 18 Apr 2019 06:16:38 -0700 (PDT) X-Google-Original-Date: Thu, 18 Apr 2019 13:16:29 GMT Message-Id: <81c08b178be6329d51586fa9d615063d3c6f9625.1555593396.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 1/8] remote-testgit: move it into the support directory for t5801 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: git@vger.kernel.org Cc: Eric Sunshine , Jeff King , Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin The `git-remote-testgit` script is really only used in `t5801-remote-helpers.sh`. It does not even contain any `@@@@` placeholders that would need to be interpolated via `make git-remote-testgit`. Let's just move it to a new home, decluttering the top-level directory and clarifying that this is just a test helper, not an official Git command that we would want to ever support. Suggested by Ævar Arnfjörð Bjarmason. Signed-off-by: Johannes Schindelin --- .gitignore | 1 - Makefile | 3 --- t/t5801-remote-helpers.sh | 2 ++ git-remote-testgit.sh => t/t5801/git-remote-testgit | 0 4 files changed, 2 insertions(+), 4 deletions(-) rename git-remote-testgit.sh => t/t5801/git-remote-testgit (100%) diff --git a/.gitignore b/.gitignore index 7374587f9d..de8fc2f5b1 100644 --- a/.gitignore +++ b/.gitignore @@ -135,7 +135,6 @@ /git-remote-ftps /git-remote-fd /git-remote-ext -/git-remote-testgit /git-remote-testpy /git-remote-testsvn /git-repack diff --git a/Makefile b/Makefile index 8654c130f8..26f8ed2228 100644 --- a/Makefile +++ b/Makefile @@ -633,7 +633,6 @@ SCRIPT_SH += git-merge-resolve.sh SCRIPT_SH += git-mergetool.sh SCRIPT_SH += git-quiltimport.sh SCRIPT_SH += git-legacy-rebase.sh -SCRIPT_SH += git-remote-testgit.sh SCRIPT_SH += git-request-pull.sh SCRIPT_SH += git-stash.sh SCRIPT_SH += git-submodule.sh @@ -657,8 +656,6 @@ SCRIPT_PERL += git-svn.perl SCRIPT_PYTHON += git-p4.py -NO_INSTALL += git-remote-testgit - # Generated files for scripts SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH)) SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL)) diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index aaaa722cca..d04f8007e0 100755 --- a/t/t5801-remote-helpers.sh +++ b/t/t5801-remote-helpers.sh @@ -8,6 +8,8 @@ test_description='Test remote-helper import and export commands' . ./test-lib.sh . "$TEST_DIRECTORY"/lib-gpg.sh +PATH="$TEST_DIRECTORY/t5801:$PATH" + compare_refs() { git --git-dir="$1/.git" rev-parse --verify $2 >expect && git --git-dir="$3/.git" rev-parse --verify $4 >actual && diff --git a/git-remote-testgit.sh b/t/t5801/git-remote-testgit similarity index 100% rename from git-remote-testgit.sh rename to t/t5801/git-remote-testgit -- gitgitgadget