From: Phillip Wood <phillip.wood123@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Aug 2021, #06; Mon, 16)
Date: Thu, 19 Aug 2021 11:06:40 +0100 [thread overview]
Message-ID: <2fde9f61-0b7b-63c2-d08b-50c3dd5b2c3c@gmail.com> (raw)
In-Reply-To: <xmqqh7fonhlo.fsf@gitster.g>
Hi Junio
On 17/08/2021 20:32, Junio C Hamano wrote:
> Phillip Wood <phillip.wood123@gmail.com> writes:
>
>>> * pw/rebase-skip-final-fix (2021-08-13) 3 commits
>>> - rebase --continue: remove .git/MERGE_MSG
>>> - rebase --apply: restore some tests
>>> - t3403: fix commit authorship
>>> Checking out all the paths from HEAD during the last conflicted
>>> step in "git rebase" and continuing would cause the step to be
>>> skipped (which is expected), but leaves MERGE_HEAD file behind in
>>> $GIT_DIR and confuses the next "git commit", which has been
>>> corrected.
>>> Will merge to 'next'.
>>
>> Thanks
>
> Thank *you* for the series, and you do not need to comment on your
> topic only to say that. But if you need to _stop_ me from merging a
> topic to 'next' (because you want to replace it one more time, or
> you see something wrong with it), please don't hesitate to do so.
Sure, I would not have replied just to say thanks but as I was writing
anyway I thought I would.
Best Wishes
Phillip
>>> * lh/systemd-timers (2021-07-02) 3 commits
>>> - maintenance: add support for systemd timers on Linux
>>> - maintenance: `git maintenance run` learned `--scheduler=<scheduler>`
>>> - cache.h: Introduce a generic "xdg_config_home_for(…)" function
>>> "git maintenance" scheduler learned to use systemd timers as a
>>> possible backend.
>>> Waiting for reviews.
>>
>> I'd really like to see this merged, there was some discussion a couple
>> of weeks ago (cf <4aed0293-6a48-d370-3b72-496b7c631cb5@gmail.com>), it
>> petered out but no one seemed to be objecting to merging it.
>
> Thanks for paying attention to this item.
>
> My impression was that everybody liked the ability to use systemd
> timers as an alternative to cron, but as Derrick summarised in the
> message you pointed at, the implementation is not quite there, I
> think.
>
> So "Waiting for reviews" was a mislabel; we are waiting for a
> reroll.
>
>>> * zh/cherry-pick-advice (2021-08-14) 1 commit
>>> - cherry-pick: use better advice message
>>> The advice message that "git cherry-pick" gives when it asks
>>> conflicted replay of a commit to be resolved by the end user has
>>> been updated.
>>
>> I think this is getting there now, I need to look at the tests in v5
>> but the changes to sequencer.c looked good to me.
>
> Yes.
>
>>> * jk/commit-edit-fixup-fix (2021-08-15) 1 commit
>>> - commit: restore --edit when combined with --fixup
>>> "git commit --fixup" now works with "--edit" again, after it was
>>> broken in v2.32.
>>> Will merge to 'next'?
>>
>> Yes please, there was a new version posted at the weekend but I've
>> just checked and you've already picked it up in seen.
>
> Yes, this looked good to me, too.
>
> Thanks.
>
next prev parent reply other threads:[~2021-08-19 10:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-16 23:06 What's cooking in git.git (Aug 2021, #06; Mon, 16) Junio C Hamano
2021-08-16 23:43 ` Azeem Bande-Ali
2021-08-17 16:39 ` Junio C Hamano
2021-08-17 10:20 ` Phillip Wood
2021-08-17 17:00 ` Philippe Blain
2021-08-17 19:40 ` Junio C Hamano
[not found] ` <20210817193255.e7-9qhD5EZyGJNFbpSx2zPp6pXXRq5aMFbInG-_RoCk@z>
2021-08-17 19:32 ` Junio C Hamano
2021-08-17 17:12 ` Derrick Stolee
2021-08-18 5:15 ` Eric Sunshine
2021-08-19 10:06 ` Phillip Wood [this message]
2021-08-17 21:48 ` Junio C Hamano
2021-08-19 18:55 ` Phillip Wood
2021-08-19 19:38 ` Junio C Hamano
2021-08-20 6:09 ` Giving priority to the reftable topic (was Re: What's cooking in git.git (Aug 2021, #06; Mon, 16)) Junio C Hamano
2021-08-20 22:08 ` Ramsay Jones
2021-10-07 17:27 ` Han-Wen Nienhuys
[not found] ` <CACBZZX41gwo=pv_4fn2VcLz0Qq7Av-CWsnNXfXSuzmwZnu-Q3w@mail.gmail.com>
2021-08-23 10:21 ` Ævar Arnfjörð Bjarmason
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=2fde9f61-0b7b-63c2-d08b-50c3dd5b2c3c@gmail.com \
--to=phillip.wood123@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.
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 NNTP newsgroup(s).