git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: What's cooking in git.git (Aug 2022, #06; Wed, 17)

From
JTJonathan Tan <jonathantanmy@google.com>
Date
Aug 18, 2022, 22:42 UTC
Message-ID
<20220818224222.3569397-1-jonathantanmy@google.com>
In-Reply-To
<xmqq7d36s31e.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
Show 11 quoted lines
> * en/ancestry-path-in-a-range (2022-08-17) 2 commits
>  - revision: allow --ancestry-path to take an argument
>  - rev-list-options.txt: fix simple typo
> 
>  "git rev-list --ancestry-path=C A..B" is a natural extension of
>  "git rev-list A..B"; instead of choosing a subset of A..B to those
>  that have ancestry relationship with A, it lets a subset with
>  ancestry relationship with C.
> 
>  Will merge to 'next'?
>  source: <pull.1303.git.1660704498.gitgitgadget@gmail.com>

I had some minor comments [1] but besides that, overall I think this is good.

[1] https://lore.kernel.org/git/20220818222416.3567602-1-jonathantanmy@google.com/
Show 10 quoted lines
> * en/submodule-merge-messages-fixes (2022-08-17) 3 commits
>  - merge-ort: provide helpful submodule update message when possible
>  - merge-ort: add comment to avoid surprise with new sub_flag variable
>  - merge-ort: remove translator lego in new "submodule conflict suggestion"
>  (this branch uses cw/submodule-merge-messages.)
> 
>  Further update the help messages given while merging submodules.
> 
>  Will merge to 'next'?
>  source: <pull.1325.v2.git.1660718028.gitgitgadget@gmail.com>

(I reviewed a newer version than what's currently in https://github.com/gitster/git.)

This looks good. I would have rewritten the last sentence of patch 2's commit message as "Initialize it instead to the generic CONFLICT_SUBMODULE_FAILED_TO_MERGE value. There is no change to user-visible behavior, as the only time this variable is read is when printing submodule conflict information, which special-cases CONFLICT_SUBMODULE_NOT_INITIALIZED and CONFLICT_SUBMODULE_HISTORY_NOT_AVAILABLE, and treats everything else identically.", but the existing commit message is fine too.

Previous: Junio C Hamano
Message 11 of 11 in “What's cooking in git.git (Aug 2022, #06; Wed, 17)”
  1. Junio C HamanoAug 18, 2022
  2. js/bisect-in-c (was: What's cooking in git.git (Aug 2022, #06; Wed, 17))Ævar Arnfjörð Bjarmason, Aug 18, 2022
  3. Johannes SchindelinAug 19, 2022
  4. Ævar Arnfjörð BjarmasonAug 19, 2022
  5. Derrick StoleeAug 18, 2022
  6. Derrick StoleeAug 18, 2022
  7. ds/* (was Re: What's cooking in git.git (Aug 2022, #06; Wed, 17))Derrick Stolee, Aug 18, 2022
  8. Junio C HamanoAug 18, 2022
  9. vd/* (was: Re: What's cooking in git.git (Aug 2022, #06; Wed, 17))Victoria Dye, Aug 18, 2022
  10. Junio C HamanoAug 18, 2022
  11. Jonathan TanAug 18, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.