summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-04-12 05:00:31 -0700
committerJunio C Hamano <gitster@pobox.com>2019-04-15 14:30:04 +0900
commit5afb2ce4cd19b272c218ef5901265c2519204144 (patch)
treea4f016f743f203969859965b2f7157767c29e475
parent5ee42463399ca3cc75b7e6e4368a3a5df5b010f2 (diff)
downloadgit-5afb2ce4cd19b272c218ef5901265c2519204144.tar.gz
remote-testgit: move it into the support directory for t5801
The `git-remote-testgit` script is really only used in `t5801-remote-helpers.sh`. It does not even contain any `@@<MAGIC>@@` 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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--.gitignore1
-rw-r--r--Makefile3
-rwxr-xr-xt/t5801-remote-helpers.sh2
-rwxr-xr-xt/t5801/git-remote-testgit (renamed from git-remote-testgit.sh)0
4 files changed, 2 insertions, 4 deletions
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
index 752c763eb6..752c763eb6 100755
--- a/git-remote-testgit.sh
+++ b/t/t5801/git-remote-testgit