git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Eric Musser <eric.musser@snowflake.com>, Victoria Dye <vdye@github.com>
Subject: Re: rebase update-refs can delete ref branch
Date: Fri, 09 Dec 2022 19:40:15 +0900	[thread overview]
Message-ID: <xmqqa63wzwq8.fsf@gitster.g> (raw)
In-Reply-To: <xmqq1qp90zvi.fsf@gitster.g> (Junio C. Hamano's message of "Fri, 09 Dec 2022 17:01:37 +0900")

Junio C Hamano <gitster@pobox.com> writes:

> 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.

Well, I changed my mind.  Let's bite the bullet and cherry-pick the
single patch, just for this once (as a general principle, I hate
cherry-picking and try to avoid unless the fix is absolutely needed).

This is primarily because we have enough material to prepare for
Git 2.38.2 already accumulated on the 'maint' front, all from the
bugfixes merged to 'master' for the upcoming Git 2.39.

I'd plan to tag 2.38.2 and 2.39 at the same time on coming Monday,
but note that I am operating in Asia/Tokyo timezone, so it may be
Sunday for many folks in the western hemisphere.





      reply	other threads:[~2022-12-09 10:40 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
2022-12-09 10:40     ` Junio C Hamano [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=xmqqa63wzwq8.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.
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).