Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Detect commit squashing and preserve signatures #2144

Merged
merged 44 commits into from
Feb 5, 2024
Merged

Detect commit squashing and preserve signatures #2144

Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
5323e0e
Detect commit squashing and preserve signatures
iarspider Jan 11, 2024
b22440c
Remove wrapper function for getting reactions
iarspider Jan 11, 2024
0c123e1
Cleanup
iarspider Jan 11, 2024
2fa33d7
Do not remove squashed commits, inject them after looping over existi…
iarspider Jan 15, 2024
3693aff
[WIP] Fix errors after rebasing
iarspider Jan 18, 2024
0eb92ca
Fix logic
iarspider Jan 18, 2024
5086184
Restore pre-checks
iarspider Jan 19, 2024
6f37df5
Add detection of back-dated commits
iarspider Jan 22, 2024
d23f7a3
Do not warn about back-dated commits in new PRs
iarspider Jan 25, 2024
72556be
Revert accidental change
iarspider Jan 25, 2024
74c6caf
Changes from review
iarspider Jan 25, 2024
30ec5cc
Fix from review
iarspider Jan 25, 2024
a8fbaec
Use different way of detecting back-dated commits
iarspider Jan 25, 2024
195ced3
Use last-seen-commit sha
iarspider Jan 25, 2024
64faec0
Changes from review
iarspider Jan 25, 2024
0e9a316
Let bot re-do code-checks and tests on clean squash
iarspider Jan 29, 2024
07a7e45
Do not overwrite signed_commit_sha
iarspider Jan 29, 2024
dd98c74
Changes from review
iarspider Jan 29, 2024
413e87b
Fix for missing dictionary key
iarspider Jan 30, 2024
427e4c5
Move commits under dedicated key in bot_cache
iarspider Jan 30, 2024
47421c3
Sign any commit
iarspider Jan 30, 2024
eaf200c
Fix logic for populating bot_cache
iarspider Jan 30, 2024
4ca5f7b
Fix collect_commit_cache
iarspider Jan 30, 2024
091fc7b
Change logic to detect squashes
iarspider Jan 30, 2024
7d620b8
Further simplify squash detection
iarspider Jan 30, 2024
f2e5c5b
Improve logic restricting the commit count limit; make all new commit…
iarspider Jan 30, 2024
c1f18c3
Only set last_seen_commit_time if the squash was clean
iarspider Jan 30, 2024
c725d1f
Improve limit-checking further
iarspider Jan 30, 2024
cfa630f
Move check for commit-limit message
iarspider Jan 31, 2024
37762dd
Change timestamp of new commits to one of last commit seen if clean s…
iarspider Jan 31, 2024
1c48ce0
Remove unnecessary line
iarspider Jan 31, 2024
cb36654
Changes from review
iarspider Jan 31, 2024
966c445
Change from review
iarspider Jan 31, 2024
d74428f
[draft] Mark all new commits as having no files on clean squash (#2163)
iarspider Feb 1, 2024
06d8ae8
Fix injection of squashed commits
iarspider Feb 1, 2024
447b3d5
bug fixes; comment id string ; correct key for bot_cache
smuzaffar Feb 1, 2024
43c50f0
formatting
smuzaffar Feb 1, 2024
f90ab7f
use signed event to trigger test
smuzaffar Feb 1, 2024
70efff4
formatting
smuzaffar Feb 1, 2024
764e4d1
improve auto test start on sign
smuzaffar Feb 1, 2024
5f292dd
handle the case where a squashed commit is added back
smuzaffar Feb 1, 2024
5d5b3a0
reset squashed only for added back commits
smuzaffar Feb 1, 2024
8993110
save last seen sha in bot cache
smuzaffar Feb 1, 2024
e329212
use file checksum instead of patch for comparing
smuzaffar Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Loading