Option --patterns-from-stdin and Git hook scripts update
#1606
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
|
Thnx for your contribution. I have to park this for a while until problems in latest release have been mitigated. I will come back to you in a couple of weeks. |
paul-dingemans
requested changes
Sep 16, 2022
ktlint/src/main/kotlin/com/pinterest/ktlint/internal/KtlintCommandLine.kt
Show resolved
Hide resolved
ktlint/src/main/resources/ktlint-git-pre-commit-hook-android.sh
Outdated
Show resolved
Hide resolved
* Instead of using `grep` to filter Kotlin (script) files, doing it directly with `git diff` * Using the `-z` option for the `git` command and the `--patterns-from-stdin=''` option for the `ktlint` command so that files with special characters are handled properly. This also eliminates having to use `xargs` with that `--no-run-if-empty` hack * Quoted the `origin/$(git rev-parse --abbref-ref HEAD)` argument, just in case * Removed the `if` statement at the end that checks the exit code, since it's unnecessary - it's basically the same as `if (condition) return true else return false`
mfederczuk
changed the title
--patterns-from-stdin and -z and Git hook scripts update--patterns-from-stdin and Git hook scripts update
paul-dingemans
approved these changes
Sep 26, 2022
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
This PR adds the option
s--patterns-from-stdin[=<delimiter>]andthat'll read patterns separated by a delimiter (default is newline, giving an empty string-zor using theis-zoptionNULbyte) and add them to the patterns given on the command line.Since the
--stdinoption would already read fromstdin, it'll throw an exception if both--stdinand--patterns-from-stdin/are given.-zThese options were primarily added to update the Git hook scripts.
The main problems with the old ones were that files with special characters (e.g.: newline) in the name would not be passed along correctly (since Git quotes those filenames without the
-zoption) and that the--no-run-if-emptyhack wouldn't work on non-GNU systems. (since that option is a GNU extension)Checklist