GitMonitor.vala
authorAlan Knowles <alan@roojs.com>
Fri, 25 Aug 2017 04:50:51 +0000 (12:50 +0800)
committerAlan Knowles <alan@roojs.com>
Fri, 25 Aug 2017 04:50:51 +0000 (12:50 +0800)
GitMonitor.vala

index 12ae53b..2094908 100644 (file)
@@ -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);