From: Phillip Wood <phillip.wood123@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"ZheNing Hu" <adlternative@gmail.com>
Subject: Re: What's cooking in git.git (Aug 2021, #04; Tue, 10)
Date: Wed, 11 Aug 2021 10:51:02 +0100 [thread overview]
Message-ID: <7fc86441-add0-b08f-17ae-9e0dc5b010b0@gmail.com> (raw)
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
next prev parent reply other threads:[~2021-08-11 9:51 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-11 1:12 What's cooking in git.git (Aug 2021, #04; Tue, 10) Junio C Hamano
2021-08-11 1:34 ` brian m. carlson
2021-08-11 7:22 ` Fabian Stelzer
2021-08-11 8:04 ` Carlo Marcelo Arenas Belón
2021-08-11 16:13 ` Junio C Hamano
2021-08-11 9:51 ` Phillip Wood [this message]
2021-08-11 16:19 ` Junio C Hamano
2021-08-13 8:10 ` ZheNing Hu
2021-08-11 10:45 ` Atharva Raykar
2021-08-11 17:30 ` Junio C Hamano
2021-08-11 12:21 ` Patrick Steinhardt
2021-08-11 16:44 ` Junio C Hamano
2021-08-11 17:49 ` David Turner
2021-08-11 19:00 ` 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=7fc86441-add0-b08f-17ae-9e0dc5b010b0@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=adlternative@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
/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).