starting conspire causes an initial commit so you can pull into the repo

technomancy · Jul 25, 2008 · 5a7b87e · 5a7b87e
1 parent cd33028
commit 5a7b87e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/lib/conspire.rb b/lib/conspire.rb
@@ -22,7 +22,8 @@ def start(path, options)
     @options = options
     @path = path
     Gitjour::Application.init @path
-    FileUtils.touch(@path + '/.git/conspire')
+    FileUtils.touch(@path + '/.conspire')
+    `cd #{@path}; git add .conspire; git commit -m "initial"`
     @thread = Thread.new do
       Gitjour::Application.serve(@path, @options.name, @options.port)
     end

diff --git a/lib/conspire/support/conspire.el b/lib/conspire/support/conspire.el
@@ -69,7 +69,7 @@ If the current buffer isn't part of a conspiracy session, a new
 session will be started."
   :lighter "-conspire"
   (unless (file-exists-p (concat (file-name-directory buffer-file-name)
-                                 ".git/conspire"))
+                                 ".conspire"))
     (shell-command (format "conspire %s >& /dev/null &"
                            (file-name-directory buffer-file-name))))
   (setq conspire-timer

diff --git a/repo/foo b/repo/foo