From: Phillip Wood <phillip.wood123@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: [RFC PATCH] rebase: implement --rewind
Date: Thu, 6 Apr 2023 11:01:27 +0100 [thread overview]
Message-ID: <cfb0d0f2-dc82-885d-99d6-fa641b5a2923@gmail.com> (raw)
In-Reply-To: <4fa6d2da-4885-09d9-dddb-6f19efda6398@gmx.de>
On 05/04/2023 13:07, Johannes Schindelin wrote:
> Hi Oswald,
>
> please do reply-to-all on this list.
>
> On Tue, 28 Mar 2023, Oswald Buddenhagen wrote:
>
>> On Tue, Mar 28, 2023 at 04:53:52PM +0200, Johannes Schindelin wrote:
>>> I do not think that the concept in its
>>> current form mixes well with being in the middle of a `--rebase-merges`
>>> run.
That definitely needs to be addressed, I'd be happy to start with an
implementation that only rewinds linear history but it must error out if
it encounters a merge and --rebase-merges was given. I'd also be very
happy if we could rewind across merges by updating existing labels in
the new todo list.
> [...]
> What I need much, much, much more often is a way to redo only _part_ of
> the rebase. Like, the last 3 commits. And not from scratch, oh no! I do
> not want the original commits to be cherry-picked, but the ones that were
> already rebased.
That's what I want most often as well. Oswald's --rewind always rewinds
to $onto but I think it does use the rebased commits in the new todo
list. It looks like the new todo list will contain the commits
$onto..HEAD plus the old todo list
> In other words, I need a nested rebase.
I can see the benefit in being able to checkpoint while rebasing but I'm
not sure that needs to be tied to rewinding. For example if I'm making a
change I'm not sure about I'd like to be able to set a checkpoint before
that change so I can rewind to the previous state. I'd be happy to see
checkpointing and rewinding added separately.
Best Wishes
Phillip
> Now, why do I keep bringing up this idea of a nested rebase, when such a
> nested rebase would not be able to perform a rewind as you asked?
>
> The reason is that I am still very much unconvinced that `--rewind` can do
> anything that `git rebase --abort` and starting over cannot do. So: no
> patches required, right?
>
> However, the use case that _immediately_ comes to mind when you talk about
> these rewinds is when a part of a rebase needs to be redone, in the middle
> of said rebase. And that _does_ require a nested rebase, and the
> `--rewind` would in most cases only throw away too much work.
>
> Ciao,
> Johannes
>
> P.S.: Yes, yes, I know, a nested rebase can be simulated via
>
> git worktree add --detach /tmp/throw-away &&
> git -C /tmp/throw-away rebase -i HEAD~3 &&
> git reset --hard $(git -C /tmp/throw-away rev-parse HEAD) &&
> git worktree remove /tmp/throw-away
>
> but that is of course not only inconvenient, but leaves too much
> book-keeping and safe-guarding up to the human user, e.g. to make sure
> that the `git reset --hard` does not overwrite uncommitted changes/files.
>
> FWIW I simulate nested rebases in the illustrated way _a lot_.
prev parent reply other threads:[~2023-04-06 10:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-23 16:22 [RFC PATCH] rebase: implement --rewind Oswald Buddenhagen
2023-03-28 14:53 ` Johannes Schindelin
2023-03-28 16:11 ` Oswald Buddenhagen
2023-04-05 12:07 ` Johannes Schindelin
2023-04-05 15:15 ` Oswald Buddenhagen
2023-04-06 10:45 ` Ævar Arnfjörð Bjarmason
2023-04-06 14:49 ` Oswald Buddenhagen
2023-04-07 0:21 ` Felipe Contreras
2023-04-07 7:00 ` Oswald Buddenhagen
2023-04-11 10:06 ` Phillip Wood
2023-04-06 10:01 ` Phillip Wood [this message]
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=cfb0d0f2-dc82-885d-99d6-fa641b5a2923@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=oswald.buddenhagen@gmx.de \
--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).