[PATCH] build: allow "check" to work in non-git subdirs of worktrees

[PATCH] build: allow "check" to work in non-git subdirs of worktrees

[Eric Wong]

Some people will place the contents of an unpacked tarball
inside another directory controlled by git (e.g. a ports tree
or even git-versioned home directory).  "git ls-files" will
succeed in those cases, so we must check for the existence
of a ".git" dir, instead.
---
 Makefile.PL | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.PL b/Makefile.PL
index e9e4e2ab..c7c661e8 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -167,13 +167,14 @@ changed = \$(shell git ls-files -m)
 dsyn :: \$(addsuffix .syntax, \$(filter \$(changed), \$(syn_files)))
 
 check-manifest :: MANIFEST
-	if git ls-files >\$?.gen 2>&1; then diff -u \$? \$?.gen; fi
+	if test -e .git && git ls-files >\$?.gen 2>&1; then \
+		diff -u \$? \$?.gen; fi
 
 # the traditional way running per-*.t processes:
 check-each :: pure_all check-manifest
 	\$(EATMYDATA) \$(PROVE) --state=save -bvw -j\$(N)
 
-# lightly-tested way to runn tests, relies "--state=save" in check-each
+# lightly-tested way to run tests, relies "--state=save" in check-each
 # for best performance
 check-run :: pure_all check-manifest
 	\$(EATMYDATA) \$(PROVE) -bvw t/run.perl :: -j\$(N)

Re: [PATCH] build: allow "check" to work in non-git subdirs of worktrees

[Eric Wong]

Eric Wong <e@80x24.org> wrote:
> --- a/Makefile.PL
> +++ b/Makefile.PL
> @@ -167,13 +167,14 @@ changed = \$(shell git ls-files -m)
>  dsyn :: \$(addsuffix .syntax, \$(filter \$(changed), \$(syn_files)))
>  
>  check-manifest :: MANIFEST
> -	if git ls-files >\$?.gen 2>&1; then diff -u \$? \$?.gen; fi
> +	if test -e .git && git ls-files >\$?.gen 2>&1; then \
> +		diff -u \$? \$?.gen; fi

Oops, forgot to escape the trailing slash :x
(I'm probably still traumatized from the solver regexp :x)

diff --git a/Makefile.PL b/Makefile.PL
index c7c661e8..b8c05cf7 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -167,7 +167,7 @@ changed = \$(shell git ls-files -m)
 dsyn :: \$(addsuffix .syntax, \$(filter \$(changed), \$(syn_files)))
 
 check-manifest :: MANIFEST
-	if test -e .git && git ls-files >\$?.gen 2>&1; then \
+	if test -e .git && git ls-files >\$?.gen 2>&1; then \\
 		diff -u \$? \$?.gen; fi
 
 # the traditional way running per-*.t processes: