From 60b77c5fa1182cf95685a1ccecf0514ca5cd942f Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Wed, 23 Feb 2011 00:09:44 +0000
Subject: [PATCH] [repo] Always commit before rebasing fetched changes in case
 something changed

---
 SparkleLib/SparkleRepo.cs | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/SparkleLib/SparkleRepo.cs b/SparkleLib/SparkleRepo.cs
index fb9b4b3a..9ad53050 100644
--- a/SparkleLib/SparkleRepo.cs
+++ b/SparkleLib/SparkleRepo.cs
@@ -565,13 +565,13 @@ namespace SparkleLib {
 				LocalTimer.Stop ();
 				RemoteTimer.Stop ();
 	
-				Add ();
-
-				string message = FormatCommitMessage ();
-
-				if (message != null) {
-
+				if (RepositoryStatus.AnyDifferences) {
+					
+					Add ();
+					
+					string message = FormatCommitMessage ();
 					Commit (message);
+
 					CheckForRemoteChanges ();
 					Push ();
 
@@ -745,9 +745,14 @@ namespace SparkleLib {
 		// Merges the fetched changes
 		public void Rebase ()
 		{
+			
+			if (RepositoryStatus.AnyDifferences) {
+				
+				Add ();
+				Commit ();
 
-			Add ();
-
+			}
+			
 			Watcher.EnableRaisingEvents = false;
 
 			SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Rebasing changes...");