git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 0/4] rebase --abort/--quit: cleanup refs/rewritten

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
May 14, 2019, 18:03 UTC
Message-ID
<20190514180349.17245-1-phillip.wood123@gmail.com>
In-Reply-To
<20190426103212.8097-1-phillip.wood123@gmail.com>
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
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(-)
-- 
2.21.0
Previous: Phillip WoodNext: Phillip Wood
Message 11 of 15 in “rebase --abort: cleanup refs/rewritten”
  1. rebase --abort: cleanup refs/rewrittenPhillip Wood, Apr 26, 2019
  2. Johannes SchindelinApr 29, 2019
  3. Phillip WoodApr 30, 2019
  4. Johannes SchindelinApr 30, 2019
  5. Phillip WoodMay 1, 2019
  6. Johannes SchindelinMay 3, 2019
  7. Phillip WoodMay 3, 2019
  8. SZEDER GáborMay 7, 2019
  9. Junio C HamanoMay 7, 2019
  10. Phillip WoodMay 7, 2019
  11. 0/4 rebase --abort/--quit: cleanup refs/rewrittenPhillip Wood, May 14, 2019
  12. 1/4 rebase: fix a memory leakPhillip Wood, May 14, 2019
  13. 2/4 rebase: warn if state directory cannot be removedPhillip Wood, May 14, 2019
  14. 4/4 rebase --abort/--quit: cleanup refs/rewrittenPhillip Wood, May 14, 2019
  15. 3/4 sequencer: return errors from sequencer_remove_state()Phillip Wood, May 14, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.