From: Patrick Steinhardt <ps@pks.im>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (May 2024, #02; Fri, 3)
Date: Tue, 7 May 2024 08:15:09 +0200 [thread overview]
Message-ID: <ZjnG7XIKJMRr2K1j@tanuki> (raw)
In-Reply-To: <xmqqh6fatawj.fsf@gitster.g>
[-- Attachment #1: Type: text/plain, Size: 890 bytes --]
On Mon, May 06, 2024 at 11:05:00PM -0700, Junio C Hamano wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
> >>> * ps/undecided-is-not-necessarily-sha1 (2024-04-30) 13 commits
> >>> ...
> >> Interesting, I couldn't reproduce this issue when rebasing the patches
> >> onto "seen". There were merge conflicts though, both with
> >> jc/no-default-attr-tree-in-bare and ps/the-index-is-no-more. So maybe
> >> there was a mismerge involved somewhere?
> >
> > That is very possible.
>
> Yeah, I think I botched the merge. Somehow my resolution had an
> unneeded "|| !is_null_oid()" in the result, but the right resolution
> of course should look like below.
>
> Thanks.
Yeah, that resolution looks correct to me. I've also sent a v4 with
increased context and with the two conflicting topics pulles in as
dependency. Other than that it is the same to v3.
Patrick
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
prev parent reply other threads:[~2024-05-07 6:15 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-04 0:27 What's cooking in git.git (May 2024, #02; Fri, 3) Junio C Hamano
2024-05-04 2:59 ` Dragan Simic
2024-05-04 8:58 ` ds/scalar-reconfigure-all-fix, was " Johannes Schindelin
2024-05-06 9:21 ` Patrick Steinhardt
2024-05-06 22:17 ` Junio C Hamano
2024-05-07 6:05 ` Junio C Hamano
2024-05-07 6:15 ` Patrick Steinhardt [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZjnG7XIKJMRr2K1j@tanuki \
--to=ps@pks.im \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 read-only IMAP folder(s) and NNTP newsgroup(s).