repo git: rewrite HasLocalChanges
This commit is contained in:
parent
dbf458b931
commit
f7b5064484
|
@ -337,19 +337,10 @@ namespace SparkleLib.Git {
|
|||
SparkleGit git = new SparkleGit (LocalPath, "status --porcelain");
|
||||
git.Start ();
|
||||
|
||||
// Reading the standard output HAS to go before
|
||||
// WaitForExit, or it will hang forever on output > 4096 bytes
|
||||
string output = git.StandardOutput.ReadToEnd ().TrimEnd ();
|
||||
string output = git.StandardOutput.ReadToEnd ().Trim ();
|
||||
git.WaitForExit ();
|
||||
|
||||
string [] lines = output.Split ("\n".ToCharArray ());
|
||||
|
||||
foreach (string line in lines) {
|
||||
if (line.Trim ().Length > 0)
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
return !string.IsNullOrEmpty (output);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -443,7 +434,8 @@ namespace SparkleLib.Git {
|
|||
ResolveConflict ();
|
||||
|
||||
} catch (IOException e) {
|
||||
SparkleHelpers.DebugInfo ("Git", Name + " | Failed to resolve conflict, trying again...");
|
||||
SparkleHelpers.DebugInfo ("Git",
|
||||
Name + " | Failed to resolve conflict, trying again... (" + e.Message + ")");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue