diff --git a/src/zd/core.clj b/src/zd/core.clj index 1a5d15a..3550ac5 100644 --- a/src/zd/core.clj +++ b/src/zd/core.clj @@ -185,8 +185,8 @@ [ztx config {ev-name :ev :as ev} & opts] (println (assoc ev ::ts (str (java.util.Date.))))) -(defn start [& [dir]] - (let [ztx (zen/new-context {:zd/dir dir})] +(defn start [& [dir gitsync]] + (let [ztx (zen/new-context {:zd/dir dir :zd/gitsync gitsync})] (zen/read-ns ztx 'zd) (zen/start-system ztx 'zd/system) ztx)) diff --git a/src/zd/store.clj b/src/zd/store.clj index 59e7cea..d6a6f4e 100644 --- a/src/zd/store.clj +++ b/src/zd/store.clj @@ -475,7 +475,7 @@ :zd/all-errors true}))) (defn load-repo [ztx] - (when (:gitsync @ztx) + (when (:zd/gitsync @ztx) (git/with-identity ident (let [repo (git/load-repo (System/getProperty "user.dir")) pull-result (git/git-pull repo {:ff-mode :ff :rebase-mode :none :strategy :ours})] diff --git a/test/zd/zentext_test.clj b/test/zd/zentext_test.clj index c6d0f21..82a9378 100644 --- a/test/zd/zentext_test.clj +++ b/test/zd/zentext_test.clj @@ -1,6 +1,7 @@ (ns zd.zentext-test (:require ;; [zd.api] + [zd.view.zentext] [zd.zentext :as zentext] [zen.core :as zen] [matcho.core :as matcho]