Skip to content

Fixes #86 - Deadlock when the last commit message is greater than 4096 bytes #130

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

Open
joshooaj wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes #86 - Deadlock when the last commit message is greater than 4096 bytes #130

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
97 changes: 39 additions & 58 deletions BuildHelpers/Public/Invoke-Git.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,75 +81,56 @@
)

$Path = (Resolve-Path $Path).Path
# http://stackoverflow.com/questions/8761888/powershell-capturing-standard-out-and-error-with-start-process
$pinfo = New-Object System.Diagnostics.ProcessStartInfo
if(!$PSBoundParameters.ContainsKey('GitPath')) {
$GitPath = (Get-Command $GitPath -ErrorAction Stop)[0].Path
}
$pinfo.FileName = $GitPath
# http://stackoverflow.com/questions/8761888/powershell-capturing-standard-out-and-error-with-start-process
$pinfo = [System.Diagnostics.ProcessStartInfo]@{
FileName = $GitPath
Arguments = ''
WorkingDirectory = $Path
UseShellExecute = $UseShellExecute
CreateNoWindow = $NoWindow
RedirectStandardOutput = $RedirectStandardOutput
RedirectStandardError = $RedirectStandardError
}
$Command = $GitPath
$pinfo.CreateNoWindow = $NoWindow
$pinfo.RedirectStandardError = $RedirectStandardError
$pinfo.RedirectStandardOutput = $RedirectStandardOutput
$pinfo.UseShellExecute = $UseShellExecute
$pinfo.WorkingDirectory = $Path
if($PSBoundParameters.ContainsKey('Arguments'))
{
if (![string]::IsNullOrWhiteSpace($Arguments)) {
$pinfo.Arguments = $Arguments
$Command = "$Command $Arguments"
$Command = '{0} {1}' -f $Command, $Arguments
}
$p = New-Object System.Diagnostics.Process
$p.StartInfo = $pinfo
$null = $p.Start()
$p = [System.Diagnostics.Process]::Start($pInfo)

$stringBuilder = [text.stringbuilder]::new()
while ($null -ne ($line = $p.StandardOutput.ReadLine())) {
$null = $stringBuilder.AppendLine($line.Trim())
}
$stdout = if ($split) { $stringBuilder.ToString() -split "`n" } else { $stringBuilder.ToString() }

$null = $stringBuilder.Clear()
while ($null -ne ($line = $p.StandardError.ReadLine())) {
$null = $stringBuilder.AppendLine($line.Trim())
}
$stderr = if ($split) { $stringBuilder.ToString() -split "`n" } else { $stringBuilder.ToString() }

$p.WaitForExit()
if($Quiet)
{
if ($Quiet) {
return
}
else
{
#there was a newline in output...
if($stdout = $p.StandardOutput.ReadToEnd())
{
if($split)
{
$stdout = $stdout -split "`n" | Where-Object {$_}
}
$stdout = foreach($item in @($stdout)){
$item.trim()
}
}
if($stderr = $p.StandardError.ReadToEnd())
{
if($split)
{
$stderr = $stderr -split "`n" | Where-Object {$_}
}
$stderr = foreach($item in @($stderr)){
$item.trim()
}
}

if($Raw)
{
[pscustomobject]@{
Command = $Command
Output = $stdout
Error = $stderr
}
if ($Raw) {
[pscustomobject]@{
Command = $Command
Output = $stdout
Error = $stderr
}
else
{
if($stdout)
{
$stdout
}
if($stderr)
{
foreach ($errLine in $stderr)
{
Write-Error $errLine.trim()
}
} else {
if ($stdout) {
$stdout
}
if ($stderr) {
foreach ($errLine in $stderr) {
Write-Error $errLine
}
}
}
Expand Down