From: Ian Jackson 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-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=fddf9e5e4ed1eba1a0eb5b9c0ea5699044cea97d;p=dgit.git 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 --- diff --git a/debian/changelog b/debian/changelog index cc3208b2..f4e8c3bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ dgit (3.14~) stable; urgency=medium - * + Test suite: + * oldnewtagalt: Fix regression when running outside git tree, + introduced in 3.12. -- diff --git a/tests/lib b/tests/lib index fcff468b..d36e8ebf 100644 --- a/tests/lib +++ b/tests/lib @@ -359,7 +359,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 \