Re: SubmittingPatchs: clarify choice of base and testing

From: Fabian Stelzer <fs@gigacodes.de>
Date: Oct 25, 2021, 08:59 UTC
Message-ID: <006c186e-c005-28a3-7a5c-27d365ffe026@gigacodes.de>
In-Reply-To: <xmqqa6izcwio.fsf_-_@gitster.g>

On 23.10.21 22:32, Junio C Hamano wrote:> * A new feature should be based on `master` in general. If the new

Show 7 quoted lines

> -  feature depends on a topic that is in `seen`, but not in `master`,
> -  base your work on the tip of that topic.
> +  feature depends on other topics that are in `next`, but not in
> +  `master`, fork a branch from the tip of `master`, merge these topics
> +  to the branch, and work on that branch.  You can remind yourself of
> +  how you prepared the base with `git log --first-parent master..`
> +  easily by doing so.

Using the topic branches from gitster/git that were merged? Or by selecting the specific commits from the merge into next?

Show 8 quoted lines

> @@ -260,8 +281,8 @@ or include any extra files which do not relate to what your patch
>  is trying to achieve. Make sure to review
>  your patch after generating it, to ensure accuracy.  Before
>  sending out, please make sure it cleanly applies to the `master`
> -branch head.  If you are preparing a work based on "next" branch,
> -that is fine, but please mark it as such.
> +branch head.  If you are preparing a work based on selected topics
> +merged to `master`, please mark your patch as such.

I think this meant to say 'merged to "next|maint|seen"'? Or topics selected for being merged into master?

Thanks, Fabian