0
@@ -14,13 +14,23 @@
0
         def understands_dir?(dir)
0
           path = dir
0
           begin
0
-            while path.parent && path.to_s != "/"
0
-              response = git(:status, path)
0
-              return true if response =~ /# On branch /
0
+            begin
0
+              logger.debug {"git status on #{path}"}
0
+              Dir.chdir(path) do
0
+                response = git(:status)
0
+                return true if response =~ /# On branch /
0
+              end
0
+            rescue Errno::ENOENT
0
+              # NOP, we assume this is simply because the folder hasn't been created yet
0
               path = path.parent
0
+              retry unless path.to_s == "/"
0
+              return false
0
             end
0
           rescue BadCommand
0
             # NOP, as we return false below
0
+          rescue Piston::Git::Client::CommandError
0
+            # This is certainly not a Git repository
0
+            false
0
           end
0
 
0
           false

0
@@ -6,7 +6,8 @@
0
   end
0
 
0
   def test_does_git_status_on_directory
0
-    Piston::Git::WorkingCopy.expects(:git).with(:status, @dir).returns("# On branch master
0
+    Dir.expects(:chdir).with(@dir).yields
0
+    Piston::Git::WorkingCopy.expects(:git).with(:status).returns("# On branch master
0
 nothing to commit (working directory clean)
0
 ")
0
     assert Piston::Git::WorkingCopy.understands_dir?(@dir)
0
@@ -16,9 +17,11 @@
0
     @wc = @dir
0
     @tmp = @wc.parent
0
     @root = @tmp.parent
0
-    Piston::Git::WorkingCopy.expects(:git).with(:status, @wc)
0
-    Piston::Git::WorkingCopy.expects(:git).with(:status, @tmp)
0
-    Piston::Git::WorkingCopy.expects(:git).with(:status, @root).returns("# On branch master
0
+
0
+    Dir.expects(:chdir).with(@dir).raises(Errno::ENOENT)
0
+    Dir.expects(:chdir).with(@tmp).raises(Errno::ENOENT)
0
+    Dir.expects(:chdir).with(@root).yields
0
+    Piston::Git::WorkingCopy.expects(:git).with(:status).returns("# On branch master
0
 nothing to commit (working directory clean)
0
 ")
0
     assert Piston::Git::WorkingCopy.understands_dir?(@dir)