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

Add --binary when creating patch for unstaged files #603

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add --binary when creating patch for unstaged files #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb16647
Add --binary when creating patch for unstaged files
GrahamBorland Sep 6, 2022
543d2ef
Add changelog entry
GrahamBorland Apr 1, 2023
9becbba
Merge branch 'main' into master
GrahamBorland Apr 1, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).

- fix new ktlint errors that come from our new default version of ktlint [#651](https://github.com/JLLeitschuh/ktlint-gradle/pull/651)
- fix syntax bug in release logic for VERSION_LATEST_RELEASE.txt [#651](https://github.com/JLLeitschuh/ktlint-gradle/pull/651)
- fix the pre-commit hook to cope with unstaged binary files [#603](https://github.com/JLLeitschuh/ktlint-gradle/pull/603)

### Changed

Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/GitHook.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ internal fun generateGitHook(
echo "${'$'}CHANGED_FILES"

diff=.git/unstaged-ktlint-git-hook.diff
git diff --color=never > ${'$'}diff
git diff --binary --color=never > ${'$'}diff
if [ -s ${'$'}diff ]; then
git apply -R ${'$'}diff
fi
Expand Down