Skip to content

Fix a build warning in the git status plugin. #123

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

Merged
merged 1 commit into from
Nov 17, 2023
Merged

Fix a build warning in the git status plugin. #123

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 5 additions & 9 deletions Sources/GitStatus/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,13 @@ func _runGit(passing arguments: String..., readingUpToCount maxOutputCount: Int)
defer {
process.terminate()
}
if #available(macOS 10.15.4, *) {
guard let output = try? stdoutPipe.fileHandleForReading.read(upToCount: maxOutputCount) else {
return nil
}
return String(data: output, encoding: .utf8)

let output = if #available(macOS 10.15.4, *) {
try? stdoutPipe.fileHandleForReading.read(upToCount: maxOutputCount)
} else {
guard let output = try? stdoutPipe.fileHandleForReading.readData(ofLength: maxOutputCount) else {
return nil
}
return String(data: output, encoding: .utf8)
stdoutPipe.fileHandleForReading.readData(ofLength: maxOutputCount)
}
return output.flatMap { String(data: $0, encoding: .utf8) }
#else
return nil
#endif
Expand Down