Re: [PATCH v6 0/3] branch: inherit tracking configs

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 16, 2021, 00:02 UTC
Message-ID: <xmqqsfutzaaq.fsf@gitster.g>
In-Reply-To: <cover.1639524556.git.steadmon@google.com>

Josh Steadmon <steadmon@google.com> writes:

Show 13 quoted lines

> Changes since V5:
> * Greatly simplified BRANCH_CONFIG_VERBOSE output to not require nearly
>   so many conditionals.
> * Note that rebasing is not compatible with inheriting multiple upstream
>   branches.
> * Moved the change to case-sensitivity for branch.autosetupmerge to its
>   own commit.
> * Improve advice on failed tracking setup when multiple branches are
>   involved.
> * Make better use of string_list API.
> * Make better use of config API.
> * More straight-forward use of the `struct tracking` API.
> * Numerous style fixes.

I've queued this, and rebased Glen's "branch --recurse-submodules" on top, and parked both of them near the tip of 'seen'. I do not have much confidence in the conflict resolution needed during the rebasing or the other branch or merges into 'seen', and I would appreciate it if you two can take a look to sanity check the result.

Thanks.