[v2,0/4] rebase --abort/--quit: cleanup refs/rewritten
mbox series

Message ID 20190514180349.17245-1-phillip.wood123@gmail.com
Headers show
  • rebase --abort/--quit: cleanup refs/rewritten
Related show


Phillip Wood May 14, 2019, 6:03 p.m. UTC
From: Phillip Wood <phillip.wood@dunelm.org.uk>

refs/rewritten/ is now cleaned up on --quit as well as --abort. I've
also added a patch to make sequencer_remove_state() to return any
errors, so rebase now always reports any errors that occur when
cleaning up the state directory.

These patches are still based on pw/rebase-i-internal, the first 3
could probably be applied to maint if required.

I'm going to be off line for ten days or so from Thursday so there's
no hurry to look at these (also we're in an rc phase at the moment)

Best Wishes


Phillip Wood (4):
  rebase: fix a memory leak
  rebase: warn if state directory cannot be removed
  sequencer: return errors from sequencer_remove_state()
  rebase --abort/--quit: cleanup refs/rewritten

 builtin/rebase.c         | 39 +++++++++++++++++++++++++++++----------
 sequencer.c              | 11 +++++++----
 t/t3430-rebase-merges.sh | 18 +++++++++++++++++-
 3 files changed, 53 insertions(+), 15 deletions(-)