This is the mail archive of the
mailing list for the GCC project.
Re: Help with new GCC git workflow...
- From: Joseph Myers <joseph at codesourcery dot com>
- To: Jason Merrill <jason at redhat dot com>
- Cc: Jonathan Wakely <jwakely at redhat dot com>, Peter Bergner <bergner at linux dot ibm dot com>, GCC <gcc at gcc dot gnu dot org>
- Date: Tue, 14 Jan 2020 17:48:55 +0000
- Subject: Re: Help with new GCC git workflow...
- Ironport-sdr: Kxpz6cGwPvU5tz5kFJ/KngSloTq5TUV8aWz7HYvqoW/wOouFLSFovsTeHWuDbx6cymNxqfQU77 Om4BcqOA3tPE0OOY4jquokgU4c1tS+ajMvwieMHcD7NGVwXUH1bixRPWG0MqfWA/f1OnMm7kfx CgpQee2m4z35p2guXjYInp2S5FtX6la8b1s4DqjZUkTfYOiHl85W0B02cQWYFGGpPkqZxSY1zs HO+rYewGzlvfQTVLUeJ4hkyzrJgngUHnnts63dpsB8ejXbIrMfQZdcIrBHiOHfF7H34Mc+f/uS Xao=
- Ironport-sdr: MBReuBuntQxpwcBmUm022Wp/UxH4eD9d3HTDuvM5rX4Wv8FzY5DHSkU/NJACdbEgmByZpcCyJh rv4qe+Kwl2PeZCcRPobXFTBxe768t6ynYL46Z4D1JtNBokyA1T8VM4+CjVcM6DhG/oEXKTu7ke laphYxVAc5cSHJrx/3bvBW9vTdnpGEf/QSeNL3vurXEIfj88NwCl/Ueo8vp+ZScd2+ojTaNE37 mQZJ6h2H/IwxqvITos581cBAYWMxsQ0MPECHj3ONkFrWmAS8GsyvrGO1TNT+WZ3nDRZzcVf9b3 PFw=
- References: <email@example.com> <20200114170551.GA413903@redhat.com> <CADzB+2my7B6db1iYvYKqzLAcDLdMx3XJHt47H6ceN1Q9firstname.lastname@example.org>
On Tue, 14 Jan 2020, Jason Merrill wrote:
> I think we're prohibiting merges to master. We definitely don't want
> merges of branches with commits that don't each satisfy the normal rules
> for commits.
Yes. The hooks prevent pushing a merge commit to master or a release
branch. A branch can still end up as multiple commits on master, if there
are multiple logically separate changes there (in which case it *should*
end up as multiple commits, one for each change that makes sense on its
own), but each of the commits that ends up on master should be correct in
itself (as far as known at the time they are pushed), to support
Joseph S. Myers