repo git: rewrite HasLocalChanges
This commit is contained in:
parent
90ce809d6f
commit
4acb33ae0d
|
@ -337,19 +337,10 @@ namespace SparkleLib.Git {
|
||||||
SparkleGit git = new SparkleGit (LocalPath, "status --porcelain");
|
SparkleGit git = new SparkleGit (LocalPath, "status --porcelain");
|
||||||
git.Start ();
|
git.Start ();
|
||||||
|
|
||||||
// Reading the standard output HAS to go before
|
string output = git.StandardOutput.ReadToEnd ().Trim ();
|
||||||
// WaitForExit, or it will hang forever on output > 4096 bytes
|
|
||||||
string output = git.StandardOutput.ReadToEnd ().TrimEnd ();
|
|
||||||
git.WaitForExit ();
|
git.WaitForExit ();
|
||||||
|
|
||||||
string [] lines = output.Split ("\n".ToCharArray ());
|
return !string.IsNullOrEmpty (output);
|
||||||
|
|
||||||
foreach (string line in lines) {
|
|
||||||
if (line.Trim ().Length > 0)
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -443,7 +434,8 @@ namespace SparkleLib.Git {
|
||||||
ResolveConflict ();
|
ResolveConflict ();
|
||||||
|
|
||||||
} catch (IOException e) {
|
} 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