From: Alan Knowles Date: Tue, 6 Nov 2018 04:35:39 +0000 (+0800) Subject: sync X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=9d62e97e5ecab71cdff5536e049eb2e06827e7d0 sync --- diff --git a/GitMonitor.vala b/GitMonitor.vala index 052b05f4..c739d622 100644 --- a/GitMonitor.vala +++ b/GitMonitor.vala @@ -250,7 +250,7 @@ public class GitMonitor : Monitor } foreach(var q in this.queue) { - if (!q.shouldIgnore() && !q.repo.is_wip_branch()) { + if (!q.shouldIgnore() && !q.repo.is_wip_branch() && q.repo.is_auto_branch()) { var oldq = this.queue; this.queue = new Gee.ArrayList(); NewBranch.singleton().show(q.repo, oldq); diff --git a/GitRepo.vala b/GitRepo.vala index afb8ab4d..7ec4f418 100644 --- a/GitRepo.vala +++ b/GitRepo.vala @@ -179,6 +179,11 @@ public class GitRepo : Object { return !FileUtils.test(this.gitdir + "/.gitlive-disable-autocommit" , FileTest.EXISTS); } + + public bool is_auto_branch () + { + return FileUtils.test(this.gitdir + "/.gitlive-enable-auto-branch" , FileTest.EXISTS); + } public bool is_autopush () { return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS);