chiark / gitweb /
badcommit-rewrite: Fix operation using installed version of fixup.
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 8 Jan 2017 21:03:50 +0000 (21:03 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 8 Jan 2017 21:03:52 +0000 (21:03 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
debian/changelog
tests/tests/badcommit-rewrite

index 3e3aa57..53c4eb0 100644 (file)
@@ -2,6 +2,7 @@ dgit (2.17~) unstable; urgency=medium
 
   Test suite:
   * Internal improvements.
+  * badcommit-rewrite: Fix operation using installed version of fixup.
 
  --
 
index c07d9ae..1429e67 100755 (executable)
@@ -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