fix(pre-commit): handle unmerged files #1148
Merged
Conversation
This file contains hidden or 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
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #1148 +/- ##
=======================================
Coverage 91.96% 91.97%
=======================================
Files 144 144
Lines 6199 6202 +3
=======================================
+ Hits 5701 5704 +3
Misses 498 498
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
6d7a
force-pushed
the
kevinwestphal/handle-unmerged-files
branch
from
b98bbff to
2c2c0a8
Compare
Unmerged files that are scanned by the pre-commit hook during an ongoing merge will be marked as unmerged and scanned if they contain diffs.
6d7a
force-pushed
the
kevinwestphal/handle-unmerged-files
branch
from
2c2c0a8 to
41d0958
Compare
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.
Context
When calling
ggshield secret scan pre-commitduring an ongoing merge with unmerged files,ggshieldthrows an error. This PR fixes this.Closes #1002
What has been done
Unmerged files that are scanned by the pre-commit hook during an ongoing merge will be marked as unmerged and scanned if they contain diffs.
Validation
See #1002 for a reproducible example.
PR check list
skip-changeloglabel has been added to the PR.