From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 5 Jan 2018 23:15:51 +0000 (+0000)
Subject: test suite: lib: t-git-fsck: put dgit-test-fsck.errs in git dir
X-Git-Tag: archive/debian/4.2~15
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=54b427747f1491776db2cba723645dd437c3e606;hp=625519607d0e5552d0e0372fc833e9def2f219c5

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 380165c0..a186c713 100644
--- 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:
   * 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 277ad5e3..fcc2a697 100644
--- a/tests/lib
+++ b/tests/lib
@@ -360,7 +360,7 @@ t-expect-fsck-fail () {
 }
 
 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 \