From 54b427747f1491776db2cba723645dd437c3e606 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 5 Jan 2018 23:15:51 +0000 Subject: [PATCH] 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 Signed-off-by: Ian Jackson --- debian/changelog | 3 ++- tests/lib | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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 \ -- 2.30.2