Re: What's cooking in git.git (May 2024, #02; Fri, 3)

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