Merge branch 'NotDaveLane-master'

robertodecurnex · robertodecurnex · commit 50d80b6b3bc7 · 2015-01-05T14:46:14.000-03:00
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -47,6 +47,7 @@ def init(opts={})
     #
     # accepts options:
     #  :remote::    name of remote (rather than 'origin')
+    #  :branch::    name of branch to track (rather than 'master')
     #  :bare::      no working directory
     #  :recursive:: after the clone is created, initialize all submodules within, using their default settings.
     #  :depth::     the number of commits back to pull
@@ -58,6 +59,7 @@ def clone(repository, name, opts = {})
       clone_dir = opts[:path] ? File.join(@path, name) : name
       
       arr_opts = []
+      arr_opts << "-b" << opts[:branch] if opts[:branch]
       arr_opts << "--bare" if opts[:bare]
       arr_opts << "--recursive" if opts[:recursive]
       arr_opts << "-o" << opts[:remote] if opts[:remote]
diff --git a/tests/units/test_init.rb b/tests/units/test_init.rb
@@ -67,6 +67,13 @@ def test_git_clone
     end
   end
   
+  def test_git_clone_with_branch
+    in_temp_dir do |path|      
+      g = Git.clone(@wbare, 'clone-branch', :branch => 'test')
+      assert_equal(g.current_branch, 'test')
+    end
+  end
+  
   def test_git_clone_bare
     in_temp_dir do |path|      
       g = Git.clone(@wbare, 'bare.git', :bare => true)
