From 6729ef1a606dc967a2cc4f1627d7dd371f0a826f Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Sun, 23 May 2010 19:03:05 +0100
Subject: [PATCH] forget to read the git status output in rebase

---
 SparkleShare/SparkleRepo.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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