Re: [PATCH 8/5] SubmittingPatches: use of older maintenance tracks is an exception

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Thank you for breaking out these patches (in the future I will try to do
it on my end to save you the trouble). I just have small wording nits
(see below), but otherwise LGTM.

Thanks again.

Junio C Hamano <gitster@xxxxxxxxx> writes:

> diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
> index 559c02c90c..0d1b53d4e5 100644
> --- a/Documentation/SubmittingPatches
> +++ b/Documentation/SubmittingPatches
> @@ -46,15 +46,22 @@ latest HEAD commit of `maint` or `master` based on the following cases:
>  * If you are fixing bugs in the released version, use `maint` as the
>    starting point (which may mean you have to fix things without using
>    new API features on the cutting edge that recently appeared in
> -  `master` but were not available in the released version). If the bug
> -  exists in an older version (e.g., commit `X` introduced the bug, and
> -  `git describe --containx X` says `v2.30.0-rc2-gXXXXXX` has it), then
> -  use the tip of the maintenance branch for the 2.30.x versions in the
> -  `maint-2.30` branch in https://github.com/gitster/git[the maintainer's
> -  repo].
> +  `master` but were not available in the released version).
>  
>  * Otherwise (such as if you are adding new features) use `master`.
>  
> +
> +NOTE: In an exceptional case, a bug that was introduced in an old

I think "In exceptional cases" reads more naturally.

> +version may have to be fixed for users of releases that are much older
> +than the recent releases.  `git describe --contains X` may describe
> +`X` as `v2.30.0-rc2-gXXXXXX` for the commit `X` that introduced the
> +bug, and the bug may be so high-impact that we may need to issue a new
> +maintenance release for Git 2.30.x series, when "Git 2.41.0" is the
> +current release.  In such a case, you may want to use the tip of the
> +maintenance branch for the 2.30.x series, which may be available as

s/as/in the

> +`maint-2.30` branch in https://github.com/gitster/git[the maintainer's
> +"broken out" repo].
> +
>  This also means that `next` or `seen` are inappropriate starting points
>  for your work, if you want your work to have a realistic chance of
>  graduating to `master`.  They are simply not designed to be used as a
> -- 
> 2.41.0-450-ga80be15292



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux