Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

dachi-dev
Copy link
Contributor

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

  • 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 jhiesey and barslev and removed request for a team, jhiesey and barslev August 30, 2025 20:22
Copy link

github-actions bot commented Aug 30, 2025

🚀 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
@dachi-dev dachi-dev requested a review from dacoburn August 30, 2025 21:02
@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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants