chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
badcommit-rewrite: Fix operation using installed version of fixup.
[dgit.git]
/
tests
/
tests
/
badcommit-rewrite
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
t-dgit fetch stable
t-has-parent-or-is $rstable $badcommit
+fixup=${DGIT_BADCOMMIT_FIXUP-dgit-badcommit-fixup}
+
cd $tmp/git/$p.git
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
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
git symbolic-ref HEAD >../sym.after
git rev-parse HEAD >../ref.after