Skip to content

git: consistently read from stdout before exit wait #1136

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
Feb 28, 2023
Merged

git: consistently read from stdout before exit wait #1136

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
6 changes: 4 additions & 2 deletions src/shared/Core/GitConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,9 @@ public bool TryGet(GitConfigurationLevel level, GitConfigurationType type, strin
using (Process git = _git.CreateProcess($"config --null {levelArg} {typeArg} {QuoteCmdArg(name)}"))
{
git.Start();
// To avoid deadlocks, always read the output stream first and then wait
// TODO: don't read in all the data at once; stream it
string data = git.StandardOutput.ReadToEnd();
git.WaitForExit();

switch (git.ExitCode)
Expand All @@ -214,7 +217,6 @@ public bool TryGet(GitConfigurationLevel level, GitConfigurationType type, strin
return false;
}

string data = git.StandardOutput.ReadToEnd();
string[] entries = data.Split('\0');
if (entries.Length > 0)
{
Expand Down Expand Up @@ -301,7 +303,7 @@ public IEnumerable<string> GetAll(GitConfigurationLevel level, GitConfigurationT
using (Process git = _git.CreateProcess(gitArgs))
{
git.Start();

// To avoid deadlocks, always read the output stream first and then wait
// TODO: don't read in all the data at once; stream it
string data = git.StandardOutput.ReadToEnd();
git.WaitForExit();
Expand Down