summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rwxr-xr-xtests/tests/badcommit-rewrite6
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 3e3aa57..53c4eb0 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 c07d9ae..1429e67 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