git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Phillip Wood <phillip.wood123@gmail.com>
To: Git Mailing List <git@vger.kernel.org>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Junio C Hamano <gitster@pobox.com>
Cc: Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: [PATCH v2 0/4] rebase --abort/--quit: cleanup refs/rewritten
Date: Tue, 14 May 2019 19:03:45 +0100	[thread overview]
Message-ID: <20190514180349.17245-1-phillip.wood123@gmail.com> (raw)
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


  parent reply	other threads:[~2019-05-14 18:04 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-26 10:32 [PATCH] rebase --abort: cleanup refs/rewritten Phillip Wood
2019-04-29 16:07 ` Johannes Schindelin
2019-04-30  8:54   ` Phillip Wood
2019-04-30 22:49     ` Johannes Schindelin
2019-05-01 15:36       ` Phillip Wood
2019-05-03  9:21         ` Johannes Schindelin
2019-05-03 10:06           ` Phillip Wood
2019-05-07 15:15 ` SZEDER Gábor
2019-05-07 16:07   ` Junio C Hamano
2019-05-07 20:06     ` Phillip Wood
2019-05-14 18:03 ` Phillip Wood [this message]
2019-05-14 18:03   ` [PATCH v2 1/4] rebase: fix a memory leak Phillip Wood
2019-05-14 18:03   ` [PATCH v2 2/4] rebase: warn if state directory cannot be removed Phillip Wood
2019-05-14 18:03   ` [PATCH v2 3/4] sequencer: return errors from sequencer_remove_state() Phillip Wood
2019-05-14 18:03   ` [PATCH v2 4/4] rebase --abort/--quit: cleanup refs/rewritten Phillip Wood

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190514180349.17245-1-phillip.wood123@gmail.com \
    --to=phillip.wood123@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=phillip.wood@dunelm.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).