summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-08 21:03:50 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-08 21:03:52 +0000
commit15b9a20af82815a4b8f76dd55d2485ee452514cc (patch)
tree5a3aa78a579ba5a352f003b25d3f43f80a30873e /tests
parentf897c3996411b844e971d66171c1e1aa290a6f24 (diff)
badcommit-rewrite: Fix operation using installed version of fixup.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/tests/badcommit-rewrite6
1 files changed, 4 insertions, 2 deletions
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