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 3e3aa574076a1e72646070001ec1ac412cc7e780..53c4eb04200004981ddfc86ddeb1160cdb3517f3 100644 (file)
--- 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 c07d9ae4a8b59884b8661a9e58c8ff50d669ec5e..1429e67340970b1ded75f7ce21dde140c2875236 100755 (executable)
--- 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