Git Mailing List Archive mirror
 help / color / mirror / Atom feed
From: Christopher Fretz <cfretz@icloud.com>
To: Taylor Blau <me@ttaylorr.com>
Cc: phillip.wood@dunelm.org.uk, git@vger.kernel.org
Subject: Re: git rebase --root bug
Date: Thu, 11 May 2023 13:52:25 -0600	[thread overview]
Message-ID: <4F6C462C-58EA-4E49-ACCC-303EFDD3E780@icloud.com> (raw)
In-Reply-To: <ZF0U6tneDjLfGxf1@nand.local>

> Wouldn't it suffice to consider the squash_onto commit as reachable the
> same way we do for `--indexed-objects`?

I think this is essentially what I was imagining, although I don’t know if it’d be considered the cleanest possible approach. I guess I just figured that the logic is already structured such that an empty commit is created to avoid having to add special handling for --root all throughout the rebase operation, and so it’s not such a stretch to then automatically consider that commit as always being reachable.

Rebase could also be reworked to not depend on the squash_onto in the case of a --root rebase, but I imagine this would be a much larger change.

  reply	other threads:[~2023-05-11 19:59 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
2023-05-11 19:52     ` Christopher Fretz [this message]
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=4F6C462C-58EA-4E49-ACCC-303EFDD3E780@icloud.com \
    --to=cfretz@icloud.com \
    --cc=git@vger.kernel.org \
    --cc=me@ttaylorr.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.
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).