fix(pre-commit-hook): update pre-commit hook to correctly handle .diff file
#18008
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
|
@Arthur-Milchior does this solve the issue ? |
BrayanDSO
reviewed
Feb 24, 2025
pre-commit
Outdated
| @@ -23,7 +23,7 @@ runKtlint () { | |||
|
|
|||
| date=$(date +%y%m%d_%H%M%S) | |||
| diff_path=.git/unstaged-ktlint-git-hook-$date.diff | |||
| git diff --color=never > $diff_path | |||
| git diff HEAD --color=never > $diff_path | |||
There was a problem hiding this comment.
this isn't in the original pre-commit hook. Is it necessary? If so, why?
There was a problem hiding this comment.
@BrayanDSO It seems I misinterpreted the logic here. I mistakenly included both unstaged and staged changes when that wasn’t necessary.
The hook was actually designed to save unstaged changes in a .diff file, apply the linter to staged changes, and then reapply the unstaged changes afterward.
The issue was that when there were no unstaged changes, it was still creating an empty .diff file.
I am pushing new changes that remove the empty .diff file. Apologies for the confusion!
BrayanDSO
added
the
Needs Author Reply
Akshit517
force-pushed
the
fix-pre-commit-hook
branch
from
ec85c80 to
db9540d
Compare
Akshit517
changed the title
.diff file
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.
Description
Fix pre-commit hook creating empty
.difffiles by removing empty.diffduring ktlint formatting.Fixes
Approach
.difffile when there are no unstaged changes.if [apply_exit_code -ne 0]->if [ $apply_exit_code -ne 0 ]How Has This Been Tested?
Checklist