From: Alan Knowles <alan@roojs.com>
Date: Fri, 25 Aug 2017 04:50:51 +0000 (+0800)
Subject: GitMonitor.vala
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=90dabe4db2595efcabb7d0ed5c6220bfa06a9823

GitMonitor.vala
---

diff --git a/GitMonitor.vala b/GitMonitor.vala
index 12ae53ba..20949083 100644
--- a/GitMonitor.vala
+++ b/GitMonitor.vala
@@ -546,8 +546,6 @@ public class GitMonitor : Monitor
 			}  
 
 
-			
-			
 			try { 
 				success += repo.commit(
 					GitMonitorQueue.messageToString(messages),
@@ -556,6 +554,17 @@ public class GitMonitor : Monitor
 				success += repo.push();
 
 			} catch(Error e) {
+			
+				// if the error is 'nothing to commit, working tree clean'
+				// then it's not an error, - just continue;
+				
+				if (/nothing to commit, working tree clean/.match(e.message)) {
+					success += e.message;
+					continue;
+				}
+				
+			
+			
 				this.paused = false;			
 				this.pauseError(e.message);