Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

feat: add minimal merge commit detection support #116

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.

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

Merged
dacoburn merged 1 commit into main from fix/merge-commit-detection-minimal
Sep 4, 2025

Conversation

@dachi-dev
Copy link
Contributor

@dachi-dev dachi-dev commented Aug 30, 2025
edited
Loading

  • Add _is_merge_commit() method to detect merge commits
  • Add _detect_merge_commit_changes() method for merge commit file detection
  • Use git diff with parent commit for merge commits instead of git show
  • Fallback to git show if merge detection fails
  • Maintains existing functionality for non-merge commits

Tested on GitHub actions. Prior to these updates, it showed no manifest file changes for merge commits and conducted a full scan. Now it picks up on the parent commit and manifest files.

@dachi-dev dachi-dev requested a review from a team as a code owner August 30, 2025 20:22
@dachi-dev dachi-dev requested review from barslev and jhiesey and removed request for a team, barslev and jhiesey August 30, 2025 20:22
Copy link

github-actions bot commented Aug 30, 2025
edited
Loading

🚀 Preview package published!

Install with:

pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple socketsecurity==2.2.6.dev1

Docker image: socketdev/cli:pr-116

@dachi-dev dachi-dev force-pushed the fix/merge-commit-detection-minimal branch from 524b96f to 19c6f0d Compare August 30, 2025 21:01
@dacoburn dacoburn merged commit 461f495 into main Sep 4, 2025
6 checks passed
@dacoburn dacoburn deleted the fix/merge-commit-detection-minimal branch September 4, 2025 02:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dacoburn dacoburn dacoburn approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

AltStyle によって変換されたページ (->オリジナル) /