Check for top == head at the start of every transaction

[stgit] / stgit / commands / redo.py

diff --git a/stgit/commands/redo.py b/stgit/commands/redo.py
index 23478f6a22df2de0903a0037907681677b9d9291..8e62a1dcbd9980bcac5292e6cbf0f09c7826ae9b 100644 (file)
--- a/stgit/commands/redo.py
+++ b/stgit/commands/redo.py
@@ -46,7 +46,8 @@ def func(parser, options, args):
         raise common.CmdException('Bad number of undos to redo')
     state = log.undo_state(stack, -options.number)
     trans = transaction.StackTransaction(stack, 'redo %d' % options.number,
         raise common.CmdException('Bad number of undos to redo')
     state = log.undo_state(stack, -options.number)
     trans = transaction.StackTransaction(stack, 'redo %d' % options.number,

-                                         discard_changes = options.hard)
+                                         discard_changes = options.hard,
+                                         allow_bad_head = True)

     try:
         log.reset_stack(trans, stack.repository.default_iw, state)
     except transaction.TransactionHalted:
     try:
         log.reset_stack(trans, stack.repository.default_iw, state)
     except transaction.TransactionHalted: