From: Phillip Wood <phillip.wood123@gmail.com>
Date: Wed, 11 Aug 2021 09:51:02 GMT
Subject: Re: What's cooking in git.git (Aug 2021, #04; Tue, 10)
Message-ID: <7fc86441-add0-b08f-17ae-9e0dc5b010b0@gmail.com>
In-Reply-To: <xmqqh7fwbx86.fsf@gitster.g>

On 11/08/2021 02:12, Junio C Hamano wrote:
> Here are the topics that have been cooking in my tree.  Commits
> prefixed with '+' are in 'next' (being in 'next' is a sign that a
> topic is stable enough to be used and are candidate to be in a
> future release).  Commits prefixed with '-' are only in 'seen',
> which means nothing more than that I have found them of interest for
> some reason (like "it may have hard-to-resolve conflicts with
> another topic already in flight" or "this may turn out to be
> useful").  Do not read too much into a topic being in (or not in)
> 'seen'.  The ones marked with '.' do not appear in any of the
> integration branches, but I am still holding onto them.
> 
> Git 2.33-rc2 will be tagged tomorrow, with a few build and
> regression fixes (not in 'master' yet as of this writing).
> 
> * ab/progress-users-adjust-counters (2021-08-05) 3 commits
>   - entry: show finer-grained counter in "Filtering content" progress line
>   - midx: don't provide a total for QSORT() progress
>   - commit-graph: fix bogus counter in "Scanning merged commits" progress line
> 
>   The code to show progress indicator in a few codepaths did not
>   cover between 0-100%, which has been corrected.

I think the midx patch wants to be dropped cf. 
<87v94jzoxj.fsf@evledraar.gmail.com>
> 
> * zh/cherry-pick-help-is-only-for-sequencer (2021-08-03) 2 commits
>    (merged to 'next' on 2021-08-04 at 9ea14ed106)
>   + cherry-pick: use better advice message
>   + cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP
> 
>   "git cherry-pick" loses its state file when a stray
>   GIT_CHERRY_PICK_HELP environment is present, which has been
>   corrected.
> 
>   Will cook in 'next'.

Sorry I missed this going into next, I thought the conclusion was to 
drop these[1] in favor of[2]

[1] 
https://lore.kernel.org/git/CAOLTT8S+x3aGRopiXwWcNYsyQtiGWChR+f8u+7nM5A0xpusR3A@mail.gmail.com/

[2] 
https://lore.kernel.org/git/pull.1010.v3.git.1628142482640.gitgitgadget@gmail.com/


Best Wishes

Phillip