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 c63b1995766db6a019b57975910651cffa1e4b48..ea772fad4d7a264f62159dcaab25ca518db0e1c6 100644 (file)
--- 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 d36e8ebfe0d4c65e115bdda84d3a5fc063ecaf1f..3c04155a2ddbe398ba480030186b1ab8add23186 100644 (file)
--- 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