MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-06 06:21:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJI-9: safe git config call

Browse Source
This commit is contained in:
Dmitriy.Panov
2018-11-30 11:38:18 +03:00
parent 29ba399365
commit 7135d26a8d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/gitUtils.kt
+8 -4
View File
@@ -302,15 +302,19 @@ internal data class CommitInfo(
val repo: File
)
internal fun <T> withUser(repo: File, user: String, email: String, block: () -> T) : T {
val originalUser = execute(repo, GIT, "config", "user.name").removeSuffix(System.lineSeparator())
val originalEmail = execute(repo, GIT, "config", "user.email").removeSuffix(System.lineSeparator())
internal fun <T> withUser(repo: File, user: String, email: String, block: () -> T): T {
val (originalUser, originalEmail) = callSafely {
execute(repo, GIT, "config", "user.name").removeSuffix(System.lineSeparator()) to
execute(repo, GIT, "config", "user.email").removeSuffix(System.lineSeparator())
} ?: "" to ""
return try {
configureUser(repo, user, email)
block()
}
finally {
configureUser(repo, originalUser, originalEmail)
callSafely {
configureUser(repo, originalUser, originalEmail)
}
}
}