diff mbox series

[1/7] remote-testgit: move it into the support directory for t5801

Message ID 81c08b178be6329d51586fa9d615063d3c6f9625.1555070430.git.gitgitgadget@gmail.com (mailing list archive)
State New, archived
Headers show
Series Assorted Documentation-related fixes | expand

Commit Message

Kazuhiro Kato via GitGitGadget April 12, 2019, noon UTC 
From: Johannes Schindelin <johannes.schindelin@gmx.de>

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>
---
 .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%)

Comments

Junio C Hamano April 15, 2019, 7:08 a.m. UTC | #1 
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:

> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> 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.

Makes sense.

> @@ -657,8 +656,6 @@ SCRIPT_PERL += git-svn.perl
>  
>  SCRIPT_PYTHON += git-p4.py
>  
> -NO_INSTALL += git-remote-testgit
> -

The line lost here was the last one that updated the value of
NO_INSTALL, so we should be able to lose all the mentions of the
make variable now.

> 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"
> +

I guess this makes much more sense than having it next to other test
helpers, as t5801 is the home for the remote-helper tests.

Thanks, will queue.
Johannes Schindelin April 18, 2019, 11:46 a.m. UTC | #2 
Hi Junio,

On Mon, 15 Apr 2019, Junio C Hamano wrote:

> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
>
> > @@ -657,8 +656,6 @@ SCRIPT_PERL += git-svn.perl
> >
> >  SCRIPT_PYTHON += git-p4.py
> >
> > -NO_INSTALL += git-remote-testgit
> > -
>
> The line lost here was the last one that updated the value of
> NO_INSTALL, so we should be able to lose all the mentions of the
> make variable now.

Sure, I added a separate commit to make it so.

Thanks,
Dscho
diff mbox series

Patch

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