From: Junio C Hamano <gitster@pobox.com>
To: Victoria Dye <vdye@github.com>
Cc: Eric Musser <eric.musser@snowflake.com>, git@vger.kernel.org
Subject: Re: rebase update-refs can delete ref branch
Date: Fri, 09 Dec 2022 17:01:37 +0900 [thread overview]
Message-ID: <xmqq1qp90zvi.fsf@gitster.g> (raw)
In-Reply-To: <8edcef4f-4438-e07a-a6fb-698b6179fcc4@github.com> (Victoria Dye's message of "Thu, 8 Dec 2022 23:50:36 -0800")
Victoria Dye <vdye@github.com> writes:
> I believe this is the same bug as one reported back in October [1], where
> deleting all 'update-ref' lines from the 'rebase-todo' inadvertently causes
> the rebase to delete those refs. The bug was fixed in 44da9e0841 (rebase
> --update-refs: avoid unintended ref deletion, 2022-11-07), so you shouldn't
> see the issue anymore in Git that's built from newer revisions (e.g., the
> latest pre-release v2.39.0-rc2 or the upcoming final v2.39.0).
Thanks for digging the history. It is unfortunate that, even though
the fix exactly identifies b3b1a21d (sequencer: rewrite update-refs
as user edits todo list, 2022-07-19) as the culprit and it is trivial
to see that was shipped as part of Git 2.38, the fix was not queued
to allow merging 44da9e0841 into 2.38.x maintenance track, so it is
unlikely to appear in any 2.38.x maintenance releases we might issue
in the future.
But if the users can afford to update to 2.38.x or 2.39.0, picking
the latter is always better, as the newer feature release has longer
shelf life ;-)
next prev parent reply other threads:[~2022-12-09 8:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-08 23:00 rebase update-refs can delete ref branch Eric Musser
2022-12-09 7:50 ` Victoria Dye
2022-12-09 8:01 ` Junio C Hamano [this message]
2022-12-09 10:40 ` Junio C Hamano
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=xmqq1qp90zvi.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=eric.musser@snowflake.com \
--cc=git@vger.kernel.org \
--cc=vdye@github.com \
/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 NNTP newsgroup(s).