Re: What's cooking in git.git (Mar 2021, #04; Sun, 14)

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mar 15, 2021, 03:43 UTC
Message-ID: <nycvar.QRO.7.76.6.2103150436260.50@tvgsbejvaqbjf.bet>
In-Reply-To: <xmqq35wx2ccy.fsf@gitster.g>

Hi Junio,

On Sun, 14 Mar 2021, Junio C Hamano wrote:

Show 6 quoted lines

> Here are the topics that have been cooking.  Commits prefixed with '-' are
> only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
> with '+' are in 'next'.  The ones marked with '.' do not appear in any of
> the integration branches, but I am still holding onto them.
>
> Git 2.31 final is expected to be tagged on Mar 15, 2021 (monday).

Okay, good.

Show 12 quoted lines

> [...]
>
> --------------------------------------------------
> [Graduated to 'master']
>
> * jn/mergetool-hideresolved-is-optional (2021-03-13) 2 commits
>   (merged to 'next' on 2021-03-13 at 23f5a25716)
>  + doc: describe mergetool configuration in git-mergetool(1)
>  + mergetool: do not enable hideResolved by default
>
>  Disable the recent mergetool's hideresolved feature by default for
>  backward compatibility and safety.

I do not see this in `master`: https://github.com/gitster/git/commit/53204061acbf7a03a6ba050f381e0bf9b01e3a78 claims that it is in `jch`, `jn/mergetool-hideresolved-is-optional`, `next` and `seen`, but not in `master`.

Show 5 quoted lines

> * tb/pack-revindex-on-disk (2021-02-26) 1 commit
>   (merged to 'next' on 2021-03-12 at 7aa348d3b3)
>  + pack-revindex.c: don't close unopened file descriptors
>
>  Fix for a topic in 'master'.

The same here, I cannot seem to find it in the `master` branch.

Thank you for such a smooth -rc phase. Maybe I'm mistaken, but I found it very uneventful this time. Which is good ;-)

Ciao, Dscho