beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

repo git: rewrite HasLocalChanges

Browse source
This commit is contained in:
Hylke Bons 2012-07-02 23:58:37 +02:00
parent aeafa39c0d
commit 9692ca655e
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
SparkleLib/Git/SparkleRepoGit.cs
View file

@ -366,19 +366,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);
}
}
@ -472,7 +463,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 + ")");
}
}