Git commit history: "fixup" commits

Hi all, I’d like to attract your attention regarding our Git commit history and related issue. A while ago I noticed that it started getting not very clear and quite verbose comparing to how it was before. We have quite significant amount of recent commits like “fix”, “address comments”, “typo”

Re: Git commit history: "fixup" commits

+1, thanks, Alexey. Also a reminder from the contributor guide: do not use the default GitHub commit message for merge commits, which looks like: Merge pull request #1234 from some_user/transient_branch_name Instead, add the commit message into the subject line, for example: "Merge pull request

Re: Git commit history: "fixup" commits

Yes, good point, thanks Valentyn. > On 4 Aug 2020, at 18:29, Valentyn Tymofieiev wrote: > > +1, thanks, Alexey. > > Also a reminder from the contributor guide: do not use the default GitHub > commit message for merge commits, which looks like: > > Merge pull request #1234 from some_user/trans

Re: Git commit history: "fixup" commits

+1 thanks Alexey. My apologies that I merged such a case recently (but not intentionally). I tried to use the "squash and merge" button with a consolidated commit message. After clicking the button, github showed "failed to merge" and gave a retry button, and after clicking that retry button, gith

Re: Git commit history: "fixup" commits

+1, thanks for the reminder. This should be really easy to automate, using https://developer.github.com/webhooks/event-payloads/#pull_request to give a warning when the change history is not sufficiently "clean." I'm not sure where to host this though (or if it could be integrated into jenkins--ba

Re: Git commit history: "fixup" commits

https://github.com/marketplace/actions/gs-commit-message-checker On Tue, Aug 4, 2020 at 10:25 AM Robert Bradshaw wrote: > +1, thanks for the reminder. > > This should be really easy to automate, using > https://developer.github.com/webhooks/event-payloads/#pull_request to > give a warning when t

Re: Git commit history: "fixup" commits

Hmm, this is strange if it was “mergeable” before, never had this. Thanks Rui! > On 4 Aug 2020, at 19:09, Rui Wang wrote: > > +1 thanks Alexey. > > My apologies that I merged such a case recently (but not intentionally). I > tried to use the "squash and merge" button with a consolidated com

Re: Git commit history: "fixup" commits

Thanks Robert and Udi for links. Perhaps we should integrate such check if there are no objections from community. I’ll take a look on this more closely. > On 4 Aug 2020, at 19:31, Udi Meiri wrote: > > https://github.com/marketplace/actions/gs-commit-message-checker >

Re: Git commit history: "fixup" commits

+1 to automating this! On Wed, Aug 5, 2020 at 8:38 AM Alexey Romanenko wrote: > Thanks Robert and Udi for links. Perhaps we should integrate such check if > there are no objections from community. I’ll take a look on this more > closely. > > On 4 Aug 2020, at 19:31, Udi Meiri wrote: > > https:/

Re: Git commit history: "fixup" commits

+1 and thank you for doing this. Tangential point: github actions are getting more and more useful, they have a public roadmap and now they support using hosted VMs as dedicated workers for a project. If the current set of github actions prove useful and reliable we can consider moving more of our