repo git: don't abort rebase on startup, fix conflicts instead. fixes #1058
This commit is contained in:
parent
94c1354a70
commit
7165cc7cae
|
@ -38,14 +38,19 @@ namespace SparkleLib.Git {
|
||||||
get {
|
get {
|
||||||
if (string.IsNullOrEmpty (this.cached_branch)) {
|
if (string.IsNullOrEmpty (this.cached_branch)) {
|
||||||
string rebase_apply_path = new string [] { LocalPath, ".git", "rebase-apply" }.Combine ();
|
string rebase_apply_path = new string [] { LocalPath, ".git", "rebase-apply" }.Combine ();
|
||||||
SparkleGit git;
|
|
||||||
|
|
||||||
if (Directory.Exists (rebase_apply_path)) {
|
if (Directory.Exists (rebase_apply_path)) {
|
||||||
git = new SparkleGit (LocalPath, "rebase --abort");
|
while (HasLocalChanges) {
|
||||||
git.StartAndWaitForExit ();
|
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 ();
|
this.cached_branch = git.StartAndReadStandardOutput ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue