From 5a7b87ee22d36b82fcbc6ecfeeff9a9ea15933c7 Mon Sep 17 00:00:00 2001
From: Phil Hagelberg <technomancy@gmail.com>
Date: Fri, 25 Jul 2008 10:32:37 -0700
Subject: [PATCH] starting conspire causes an initial commit so you can pull
 into the repo

---
 lib/conspire.rb                  | 3 ++-
 lib/conspire/support/conspire.el | 2 +-
 repo/foo                         | 0
 3 files changed, 3 insertions(+), 2 deletions(-)
 delete mode 100644 repo/foo

diff --git a/lib/conspire.rb b/lib/conspire.rb
index 4a09b62..8cdf29b 100644
--- 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
index 7809b38..a36b317 100644
--- 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
deleted file mode 100644
index e69de29..0000000