Re: What's cooking in git.git (Aug 2021, #06; Mon, 16)

Hi Junio

On 17/08/2021 20:32, Junio C Hamano wrote:

Phillip Wood [off-list ref] writes:

quoted

quoted

* 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

quoted

quoted

* 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 [ref]), 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.

quoted

quoted

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

quoted

quoted

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