From: Taylor Blau <me@ttaylorr.com>
To: phillip.wood@dunelm.org.uk
Cc: Christopher Fretz <cfretz@icloud.com>, git@vger.kernel.org
Subject: Re: git rebase --root bug
Date: Thu, 11 May 2023 12:16:42 -0400 [thread overview]
Message-ID: <ZF0U6tneDjLfGxf1@nand.local> (raw)
In-Reply-To: <288a9935-264b-4dc5-0d63-200c310f326e@gmail.com>
On Thu, May 11, 2023 at 03:21:11PM +0100, Phillip Wood wrote:
> The cause of the problem is that --root creates an empty commit (known as
> "squash_onto" in the code) which it uses as the "onto" commit. When it picks
> the first commit in the todo list the "onto" commit is amended and so is
> unreachable when the reflog is expired above. I think the best fix would be
> to stop pretending that we have a real "onto" commit when --root is used
> without --onto and either store "new root" .git/rebase-merge/onto or not
> create that file at all.
Wouldn't it suffice to consider the squash_onto commit as reachable the
same way we do for `--indexed-objects`?
Thanks,
Taylor
next prev parent reply other threads:[~2023-05-11 16:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-10 20:08 git rebase --root bug Christopher Fretz
2023-05-10 20:35 ` Kristoffer Haugsbakk
2023-05-11 4:07 ` Christopher Fretz
2023-05-11 14:21 ` Phillip Wood
2023-05-11 16:16 ` Taylor Blau [this message]
2023-05-11 19:52 ` Christopher Fretz
2023-05-12 15:18 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZF0U6tneDjLfGxf1@nand.local \
--to=me@ttaylorr.com \
--cc=cfretz@icloud.com \
--cc=git@vger.kernel.org \
--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.
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).