1 files changed, 13 insertions, 1 deletions
diff --git a/dh_elpa_test b/dh_elpa_test
index 09fe39d..c8ee10b 100755
--- a/dh_elpa_test
+++ b/dh_elpa_test
@@ -25,6 +25,9 @@ build-depends on elpa-buttercup.  Testing with ERT will be activated
 if ERT test files can be found.  Neither kind of test will be
 activated unless the debhelper compat level is 10 or higher.
 
+B<dh_elpa_test> overrides dh_auto_test(1).  If you need to switch back
+to use dh_auto_test(1), use the B<disable> configuration key, below.
+
 =head1 FILES
 
 =over 4
@@ -216,7 +219,7 @@ if ($autopkgtest) {
     my $rule = File::Find::Rule->new;
     $rule
       ->or(File::Find::Rule
-           ->name('.pc', 'debian')
+           ->name('.pc', 'debian', '.git')
            ->directory->prune->discard,
            File::Find::Rule->new);
     $rule
@@ -259,10 +262,19 @@ if ($autopkgtest) {
         no warnings 'once';
         open(OLDERR, ">&", \*STDERR);
     }
+
     # redirect stderr to stdout while we run our tests
+
     # emacs --batch and ERT itself both produce a lot of output on
     # stderr even when there has been no error, and adt-run interprets
     # this as a test failure
+
+    # Recent autopkgtest has a 'allow-stderr' restriction prevents
+    # that interpretation.  However, relying on that would require
+    # 'allow-stderr' to be specified in the d/tests/control file for
+    # every package using dh_elpa_test.  It's cleaner just to redirect
+    # here.
+
     open(STDERR, ">&STDOUT");
     # unbuffer them to ensure lines appear in the right order
     select STDERR; $| = 1;