diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-08 21:03:50 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-08 21:03:52 +0000 |
commit | 15b9a20af82815a4b8f76dd55d2485ee452514cc (patch) | |
tree | 5a3aa78a579ba5a352f003b25d3f43f80a30873e | |
parent | f897c3996411b844e971d66171c1e1aa290a6f24 (diff) |
badcommit-rewrite: Fix operation using installed version of fixup.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r-- | debian/changelog | 1 | ||||
-rwxr-xr-x | tests/tests/badcommit-rewrite | 6 |
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 |