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

repo git: don't abort rebase on startup, fix conflicts instead. fixes #1058

Browse source
This commit is contained in:
Hylke Bons 2012-11-16 10:05:57 +00:00
parent 94c1354a70
commit 7165cc7cae
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
SparkleLib/Git/SparkleRepoGit.cs
View file

@ -38,14 +38,19 @@ namespace SparkleLib.Git {
get {
if (string.IsNullOrEmpty (this.cached_branch)) {
string rebase_apply_path = new string [] { LocalPath, ".git", "rebase-apply" }.Combine ();
SparkleGit git;
if (Directory.Exists (rebase_apply_path)) {
git = new SparkleGit (LocalPath, "rebase --abort");
git.StartAndWaitForExit ();
while (HasLocalChanges) {
try {
ResolveConflict ();
} catch (IOException e) {
SparkleLogger.LogInfo ("Git", Name + " | Failed to resolve conflict, trying again... (" + e.Message + ")");
}
}
}
git = new SparkleGit (LocalPath, "rev-parse --abbrev-ref HEAD");
SparkleGit git = new SparkleGit (LocalPath, "rev-parse --abbrev-ref HEAD");
this.cached_branch = git.StartAndReadStandardOutput ();
}