FIX: genaudit can identify squash-merged pull requests #145
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
reneme
force-pushed
the
fix/detect_squash_merged_prs
branch
from
db88f39 to
10564ea
Compare
reneme
requested review from
FAlbertDev and
lieser
and removed request for
FAlbertDev
|
Oh sorry I didn't realize anyone was relying on this. I enabled squash merging momentarily on master to merge randombit/botan#3712 with a squash so it could make it in time for the 3.2 release. In general I prefer merge commits to master so it's clearly traced how a commit made it to master. |
That's what I assumed. Anyway, good to know, that we may continue to rely on the PR merge commits. 😄 |
lieser
approved these changes
Oct 10, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
So far, we relied on the fact that the Botan repository always merges pull requests with an enforced merge commit. The
genauditscript collected those merge commits and used them as ground truth to find all pull requests landed in the audit time frame.When merging pull requests with the "squash-rebase" strategy, GitHub creates a new commit that combines all commits in a pull request. This is (technically speaking) a commit straight to the main branch.
This pull request allows
genauditto distinguish such "squash-merge" commits from ordinary commits that @randombit created straight on themasterbranch. We assume that "squash-merge" commits are:Example: my fancy pull request (#1337)Limitation: This won't work when merging pull requests with the "rebase" strategy, as this may result in a fast-forward merge and won't adapt the commit messages.