From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Victoria Dye <vdye@github.com>,
git-for-windows@googlegroups.com, git@vger.kernel.org
Subject: fixup! bug, was Re: [ANNOUNCE] Git for Windows 2.37.2
Date: Mon, 15 Aug 2022 13:30:20 +0200 (CEST) [thread overview]
Message-ID: <16r2s842-1r7r-p05n-82o5-q01921r35oqr@tzk.qr> (raw)
In-Reply-To: <xmqqwnbdct1m.fsf@gitster.g>
Hi Junio,
On Fri, 12 Aug 2022, Junio C Hamano wrote:
> Victoria Dye <vdye@github.com> writes:
>
> > Johannes Schindelin wrote:
> > Just a heads-up: there was an issue with the process used to generate this
> > version. ...
>
> Sorry to see that it caused two cycles of release process. Would it
> have helped you if I had done things differently (other than "not
> issuing maintenance releases that are not security relevant"), perhaps
> giving a notice in advance by say a few days?
Thank you for offering to accommodate Git for Windows' needs.
In this instance, we tracked the problem down to
https://github.com/gitgitgadget/git/issues/1321: When a rebase has a
`pick` & `fixup` sequence and the `pick` failed and was skipped, then the
`fixup` is still trying to amend `HEAD`, which is incorrect.
In this instance, that wreaked quite the havoc, dropping most of the
Windows-specific changes due to mistaking the initial fake merge [*1*] for
a real merge.
I offer a more verbose version of this analysis in
https://github.com/git-for-windows/git/pull/3981#issuecomment-1212856115
Ciao,
Dscho
Footnote *1*: In Git for Windows, we use the "merging-rebase" strategy
where each rebase starts with a fake merge of the previous commit history
("fake" because it uses `-s ours` to avoid taking any actual content
changes). The idea is that the patches will be as clean and ready to
submit to upstream as possible by rebasing them, yet still be able to
fast-forward. For more details, see
https://github.com/git-for-windows/build-extra/blob/ab941145aeef/shears.sh#L12-L18
next prev parent reply other threads:[~2022-08-15 11:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-11 21:42 [ANNOUNCE] Git for Windows 2.37.2 Johannes Schindelin
2022-08-11 21:53 ` Junio C Hamano
2022-08-11 23:22 ` Victoria Dye
2022-08-12 16:42 ` Junio C Hamano
2022-08-15 11:30 ` Johannes Schindelin [this message]
2022-08-15 16:08 ` fixup! bug, was " 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
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=16r2s842-1r7r-p05n-82o5-q01921r35oqr@tzk.qr \
--to=johannes.schindelin@gmx.de \
--cc=git-for-windows@googlegroups.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).