From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 8 Jan 2017 21:03:50 +0000 (+0000)
Subject: badcommit-rewrite: Fix operation using installed version of fixup.
X-Git-Tag: archive/debian/3.0~101
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=15b9a20af82815a4b8f76dd55d2485ee452514cc;hp=f897c3996411b844e971d66171c1e1aa290a6f24

badcommit-rewrite: Fix operation using installed version of fixup.

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

diff --git a/debian/changelog b/debian/changelog
index 3e3aa574..53c4eb04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ dgit (2.17~) unstable; urgency=medium
 
   Test suite:
   * Internal improvements.
+  * badcommit-rewrite: Fix operation using installed version of fixup.
 
  --
 
diff --git a/tests/tests/badcommit-rewrite b/tests/tests/badcommit-rewrite
index c07d9ae4..1429e673 100755
--- a/tests/tests/badcommit-rewrite
+++ b/tests/tests/badcommit-rewrite
@@ -22,14 +22,16 @@ rstable=refs/remotes/dgit/dgit/stable
 t-dgit fetch stable
 t-has-parent-or-is $rstable $badcommit
 
+fixup=${DGIT_BADCOMMIT_FIXUP-dgit-badcommit-fixup}
+
 cd $tmp/git/$p.git
-${DGIT_BADCOMMIT_FIXUP} --real
+$fixup --real
 
 cd $tmp/$p
 git symbolic-ref HEAD >../sym.before
 git rev-parse HEAD >../ref.before
 
-${DGIT_BADCOMMIT_FIXUP} --real
+$fixup --real
 
 git symbolic-ref HEAD >../sym.after
 git rev-parse HEAD >../ref.after