From: Phillip Wood <phillip.wood123@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] rebase --abort: cleanup refs/rewritten
Date: Wed, 1 May 2019 16:36:24 +0100 [thread overview]
Message-ID: <4d486504-7f64-95fb-b7eb-51d424f3e6cc@gmail.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1904301848510.45@tvgsbejvaqbjf.bet>
Hi Dscho
On 30/04/2019 23:49, Johannes Schindelin wrote:
> Hi Phillip,
>
> On Tue, 30 Apr 2019, Phillip Wood wrote:
>
>> On 29/04/2019 17:07, Johannes Schindelin wrote:
>>>
>>> On Fri, 26 Apr 2019, Phillip Wood wrote:
>>>
>>>> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>>>>
>>>> When `rebase -r` finishes it removes any refs under refs/rewritten
>>>> that it has created. However if the rebase is aborted these refs are
>>>> not removed. This can cause problems for future rebases. For example I
>>>> recently wanted to merge a updated version of a topic branch into an
>>>> integration branch so ran `rebase -ir` and removed the picks and label
>>>> for the topic branch from the todo list so that
>>>> merge -C <old-merge> topic
>>>> would pick up the new version of topic. Unfortunately
>>>> refs/rewritten/topic already existed from a previous rebase that had
>>>> been aborted so the rebase just used the old topic, not the new one.
>>>>
>>>> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
>>>> ---
>>>
>>> Makes a ton of sense, and I feel a bit embarrassed that I forgot about
>>> that item on my TODO list. The patch looks obviously correct!
>>
>> Thanks, after I sent it I realized that --quit should probably clear
>> refs/rewritten as well, so I'll re-roll with that added. (One could argue that
>> a user might want them after quitting the rebase but there is no way to clean
>> them up safely once we've deleted the state files and I suspect most users
>> would be suprised if they were left laying around)
>
> I am not so sure. `--quit` is essentially all about "leave the state
> as-is, but still abort the rebase".
I think it depends on what you mean by "state" `--quit` is about
removing state specific to rebases while preserving HEAD, the index and
worktree. When "rebase --quit" was introduced in 9512177b68 ("rebase:
add --quit to cleanup rebase, leave everything else untouched",
2016-11-12) the start of the log message reads
rebase: add --quit to cleanup rebase, leave everything else untouched
There are occasions when you decide to abort an in-progress rebase and
move on to do something else but you forget to do "git rebase --abort"
first. Or the rebase has been in progress for so long you forgot about
it. By the time you realize that (e.g. by starting another rebase)
it's already too late to retrace your steps. The solution is normally
rm -r .git/<some rebase dir>
and continue with your life.
So `--quit` is used when the user has forgotten to run "rebase --abort".
They have moved onto something else and want to remove the rebase state
without changing the current HEAD, index or worktree, they are not
looking to use the refs under refs/rewritten. I think the refs rebase
creates under refs/rewritten is an implementation detail of "rebase -r"
and should be treated like files under .git/rebase-merge. I'm worried
that if we leave them lying around after --quit they will cause trouble
for future rebases in the same way they have after "rebase --abort"
Best Wishes
Phillip
> So if I were you, I would *not* remove the `refs/rewritten/` refs in the
> `--quit` case.
>
> Ciao,
> Dscho
>
next prev parent reply other threads:[~2019-05-01 15:36 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 [this message]
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 ` [PATCH v2 0/4] rebase --abort/--quit: " Phillip Wood
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=4d486504-7f64-95fb-b7eb-51d424f3e6cc@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).