From 90dabe4db2595efcabb7d0ed5c6220bfa06a9823 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 25 Aug 2017 12:50:51 +0800 Subject: [PATCH] GitMonitor.vala --- GitMonitor.vala | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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); -- 2.39.2