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

[Jonathan Tan <jonathantanmy@google.com>]

Junio C Hamano <gitster@pobox.com> writes:
> * 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/

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