Resolve pre-commit hook causing conflicts #502
Merged
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
Tapchicoma
reviewed
Jun 15, 2021
plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/GitHook.kt
Outdated
Show resolved
Hide resolved
| @@ -157,8 +157,10 @@ class GitHookTasksTest : AbstractPluginTest() { | |||
| build(":$INSTALL_GIT_HOOK_FORMAT_TASK").run { | |||
| assertThat(task(":$INSTALL_GIT_HOOK_FORMAT_TASK")?.outcome).isEqualTo(TaskOutcome.SUCCESS) | |||
| val hookText = gitDir.preCommitGitHook().readText() | |||
| assertThat(hookText).contains("git stash push") | |||
| assertThat(hookText).contains("git stash pop") | |||
| assertThat(hookText).contains("git diff > unstaged.diff") | |||
There was a problem hiding this comment.
I am really need to come up with git hook test setup that actually runs installed githook on some test project 🤔
|
Only thing i don't like is if the patch fails to apply after format, |
KotlinIsland
force-pushed
the
fix-git-hook
branch
from
4998ac1 to
84ed6cc
Compare
KotlinIsland
force-pushed
the
fix-git-hook
branch
from
84ed6cc to
34f18d0
Compare
Tapchicoma
approved these changes
Jun 16, 2021
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
resolves #497
The logic was using
git stash push --keep-indexwhich keeps the index but also adds it to the stash. I've change the functionality to use a .diff file with the changesgit diff > unstaged.diffand reapply it withgit apply --ignore-whitespace unstaged.diff, in my opinion using-3would be better but then git applies it to the index, not the working copy.There isn't a current version in the changes so I bumped it to 10.1.1