avoid messing up git clone from local repository

Fixes #138
mislav · Feb 7, 2012 · ce36a32 · ce36a32
1 parent 76d8468
commit ce36a32
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/hub/commands.rb b/lib/hub/commands.rb
@@ -34,7 +34,7 @@ module Commands
     # provides git interrogation methods
     extend Context
 
-    NAME_RE = /[\w.-]+/
+    NAME_RE = /\w[\w.-]*/
     OWNER_RE = /[a-zA-Z0-9-]+/
     NAME_WITH_OWNER_RE = /^(?:#{NAME_RE}|#{OWNER_RE}\/#{NAME_RE})$/
 
@@ -181,7 +181,7 @@ def clone(args)
         else
           # $ hub clone rtomayko/tilt
           # $ hub clone tilt
-          if arg =~ NAME_WITH_OWNER_RE
+          if arg =~ NAME_WITH_OWNER_RE and !File.directory?(arg)
             # FIXME: this logic shouldn't be duplicated here!
             name, owner = arg, nil
             owner, name = name.split('/', 2) if name.index('/')

diff --git a/test/hub_test.rb b/test/hub_test.rb
@@ -160,6 +160,16 @@ def test_normal_clone_from_path
     assert_forwarded "clone ./test"
   end
 
+  def test_unchanged_clone_from_existing_directory
+    stub_no_git_repo
+    assert_forwarded "clone test"
+  end
+
+  def test_local_clone_with_destination
+    stub_no_git_repo
+    assert_forwarded "clone -l . ../copy"
+  end
+
   def test_clone_with_host_alias
     stub_no_git_repo
     assert_forwarded "clone server:git/repo.git"