+1 It is easy to prevent this by using rebase merging but committers have to care about it. If Github can be configured to prevent merge commits we should do so.
Thanks, Michael > Am 09.03.2020 um 17:58 schrieb Mathieu Lirzin <mathieu.lir...@nereide.fr>: > > Hello, > > The history of OFBiz trunk with the adoption of the Pull Request based > contribution process is getting less and less readable. Here is a > snippet of `git log --oneline --graph` demonstrating that: > > --8<---------------cut here---------------start------------->8--- > a3bcdc4cc3 * | Improved: Removes getSubContentWithPermCheck and getSubSub > |/ > 8ec3886d7f * Fixed: Code refactoring to support groovy syntax (OFBIZ-1023 > 604a3bfa02 * Improved: Convert PartyInvitationService.xml from minilang t > 5b8c89906c * Merge pull request #36 from danwatford/ofbiz-11428-checkst > |\ > e665f9dc68 | * Improved: Set checkstyle to use LF line endings > e9ec4181ec * | Merge pull request #17 from PierreSmits/Label-Cleanup > |\ \ > 974b85f4ec | * | Improved: Cleanup HumanRes labels > c71a7ae06d | * | Improved: UI labels > c121ad6b9d * | | Merge pull request #15 from PierreSmits/OFBIZ-10551 > |\ \ \ > | |_|/ > |/| | > 58b0da26f5 | * | Improved: Remove unused labels from ProductUiLabels.xml > 66aa76d7f7 * | | Merge pull request #35 from danwatford/ofbiz-11418-doc > |\ \ \ > 0ece441228 | * | | Fixed: Fixed line lengths in ModelFormFieldTest to adh > cfad407c48 * | | | Merge pull request #34 from danwatford/ofbiz-11418-d > |\ \ \ \ > | |/ / / > 5640de4eba | * | | Documented: Documented use of field attribute paramete > --8<---------------cut here---------------end--------------->8--- > > I personnally think this is a huge issue because it makes analysing > history and chasing previously introduced bugs unecessary hard. > > I would strongly recommend configuring OFBiz Github to require a linear > commit history when merging PR [1]. > > Thanks. > > [1] > https://help.github.com/en/github/administering-a-repository/requiring-a-linear-commit-history > > PS: Even if I try to be polite, I am profoundly angry regarding the way > the PR contribution process has been adopted without any formal > community approval or listening to people having stated important > requirements that needed to be addressed before moving towards that new > contribution process. > > -- > Mathieu Lirzin > GPG: F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37
