test suite: lib: t-git-fsck: put dgit-test-fsck.errs in git dir

This needs to not be in the working tree; it causes trouble there.

This was broken in 090071ae8e31c8f81283af477c1114835ed8fd02
"test suite: Tolerate worktrees when trying to git-fsck"

Reported-by: Sean Whitton <spwhitton@spwhitton.name>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 380165c0ee4c862e734960a8cbb243fbb11642d7..a186c71383f1a26e6994bad5e57d9b111a0c97b3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,10 +26,11 @@ dgit (4.2~) experimental; urgency=medium
   Test suite:
   * dpkgsourceignores-docs: Correct restriction (so autopkgtest
     won't try to run it).
   Test suite:
   * dpkgsourceignores-docs: Correct restriction (so autopkgtest
     won't try to run it).

-  Test suite:

   * Additional workarounds for gnupg races (#868550) including
     retrying each individual test once, and more sophisticated
     wrapper for gpg (with locking and, sometimes saves stdin).
   * Additional workarounds for gnupg races (#868550) including
     retrying each individual test once, and more sophisticated
     wrapper for gpg (with locking and, sometimes saves stdin).

+  * oldnewtagalt: Fix regression when running outside git tree,
+    introduced in 4.1.

 
  --
 
 
  --
 

diff --git a/tests/lib b/tests/lib
index 277ad5e33df189c6b903c8378c3ad1e638a1ce30..fcc2a69766e73b34a32b8ba0cdd1112893c1775f 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -360,7 +360,7 @@ t-expect-fsck-fail () {
 }
 
 t-git-fsck () {
 }
 
 t-git-fsck () {

-       local fsckerrs=dgit-test-fsck.errs
+       local fsckerrs=$(git rev-parse --git-dir)/dgit-test-fsck.errs

 
        set +e
        LC_MESSAGES=C git fsck --no-dangling --strict 2>&1 \
 
        set +e
        LC_MESSAGES=C git fsck --no-dangling --strict 2>&1 \