From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 7 Jan 2018 11:50:41 +0000 (+0000)
Subject: Revert everything since 3.13.  Burn the version number 3.14.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=51d3d2503ffaf08c2e2bd0104f7945b295be3297;p=dgit.git

Revert everything since 3.13.  Burn the version number 3.14.

The point of the patches since 3.13 was to fix a regression in
  "test suite: Tolerate worktrees when trying to git-fsck"
   090071ae8e31c8f81283af477c1114835ed8fd02
but that commit is not on the stable branch.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/debian/changelog b/debian/changelog
index c63b1995..ea772fad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,9 @@
-dgit (3.14) UNRELEASED; urgency=medium
+dgit (3.15~) stable; urgency=medium
 
-  Test suite:
-  * oldnewtagalt: Fix regression when running outside git tree,
-    introduced in 3.12.
+  * Burn the version number 3.14 (which was implicated in some
+    patches misdirected to the stable branch).
 
- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 06 Jan 2018 01:01:49 +0000
+ --
 
 dgit (3.13) unstable; urgency=high
 
diff --git a/tests/lib b/tests/lib
index d36e8ebf..3c04155a 100644
--- a/tests/lib
+++ b/tests/lib
@@ -359,11 +359,9 @@ t-expect-fsck-fail () {
 }
 
 t-git-fsck () {
-	local fsckerrs=$(git rev-parse --git-dir)/dgit-test-fsck.errs
-
 	set +e
 	LC_MESSAGES=C git fsck --no-dangling --strict 2>&1 \
-		| tee $fsckerrs
+		| tee dgit-test-fsck.errs
 	ps="${PIPESTATUS[*]}"
 	set -e
 
@@ -377,7 +375,7 @@ t-git-fsck () {
 	pats+=(-e 'notice: No default references')
 
 	set +e
-	grep -v "${pats[@]}" $fsckerrs
+	grep -v "${pats[@]}" dgit-test-fsck.errs
 	rc=$?
 	set -e
 	case $rc in