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

forget to read the git status output in rebase

Browse source
This commit is contained in:
Hylke Bons 2010-05-23 19:03:05 +01:00
parent 68ada3a206
commit 6729ef1a60
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
SparkleShare/SparkleRepo.cs
View file

@ -224,7 +224,9 @@ namespace SparkleShare {
// Merges the fetched changes // Merges the fetched changes
public void Rebase () { public void Rebase () {
Watcher.EnableRaisingEvents = false; Watcher.EnableRaisingEvents = false;
Console.WriteLine ("[Git][" + Name + "] Rebasing fetched changes... "); Console.WriteLine ("[Git][" + Name + "] Rebasing fetched changes... ");
Process.StartInfo.Arguments = "rebase origin"; Process.StartInfo.Arguments = "rebase origin";
Process.WaitForExit (); Process.WaitForExit ();
@ -242,8 +244,7 @@ namespace SparkleShare {
Process.StartInfo.Arguments = "status"; Process.StartInfo.Arguments = "status";
Process.WaitForExit (); Process.WaitForExit ();
Process.Start(); Process.Start();
Output = Process.StandardOutput.ReadToEnd().Trim ();
Watcher.EnableRaisingEvents = false;
foreach (string Line in Regex.Split (Output, "\n")) { foreach (string Line in Regex.Split (Output, "\n")) {
@ -288,8 +289,6 @@ namespace SparkleShare {
Process.Start(); Process.Start();
Console.WriteLine ("[Git][" + Name + "] Conflict resolved."); Console.WriteLine ("[Git][" + Name + "] Conflict resolved.");
Watcher.EnableRaisingEvents = true;
Push (); Push ();
Fetch (); Fetch ();