Skip to content

Commit c7d0d01

Browse files
authored
Merge pull request #444 from Kotlin/installGitPreCommitHook-fix
pre-commit hook task fix
2 parents de6e9c2 + 880b37f commit c7d0d01

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

core/build.gradle.kts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,15 @@ tasks.withType<KorroTask> {
159159
val installGitPreCommitHook by tasks.creating(Copy::class) {
160160
doNotTrackState(/* reasonNotToTrackState = */ "Fails on TeamCity otherwise.")
161161

162-
from(File(rootProject.rootDir, "gradle/scripts/pre-commit"))
163-
into(File(rootProject.rootDir, ".git/hooks"))
164-
fileMode = 755
162+
val gitHooksDir = File(rootProject.rootDir, ".git/hooks")
163+
if (gitHooksDir.exists()) {
164+
from(File(rootProject.rootDir, "gradle/scripts/pre-commit"))
165+
into(gitHooksDir)
166+
fileMode = 755
167+
} else {
168+
logger.lifecycle("'.git/hooks' directory not found. Skipping installation of pre-commit hook.")
169+
}
170+
165171
}
166172
tasks.named("assemble") {
167173
dependsOn(installGitPreCommitHook)

core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/explainer/PluginCallbackProxy.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ object PluginCallbackProxy : PluginCallback {
118118
body =
119119
"""
120120
<details>
121-
<summary>${expressions.joinToSource()
121+
<summary>${expressions.joinToString(".") { it.source }
122122
.also {
123123
if (it.length > 95) TODO("expression is too long ${it.length}. better to split sample in multiple snippets")
124124
}

0 commit comments

Comments
 (0)