implementation of --t switch on git branch command

lacravate · lacravate · commit 438798ea5340 · 2012-11-01T01:19:54.000+01:00
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -181,8 +181,11 @@ def branches
     end
     
     # returns a Git::Branch object for branch_name
-    def branch(branch_name = 'master')
-      Git::Branch.new(self, branch_name)
+    # -- addition of options noticeably to implement
+    #    --t switch on 'git branch' command
+    def branch(branch_name = 'master', options={})
+    #
+      Git::Branch.new(self, branch_name, options[:track])
     end
     
     # returns +true+ if the branch exists locally
diff --git a/lib/git/branch.rb b/lib/git/branch.rb
@@ -3,20 +3,25 @@ class Branch < Path
     
     attr_accessor :full, :remote, :name
     
-    def initialize(base, name)
+    # -- addition of track parameter for --t switch
+    def initialize(base, name, track=nil)
+    #
       @remote = nil
       @full = name
       @base = base
       @gcommit = nil
       @stashes = nil
       
-      parts = name.split('/')
-      if parts[1]
-        @remote = Git::Remote.new(@base, parts[0])
-        @name = parts[1]
-      else
-        @name = parts[0]
+      # -- addition of track attribute to implement
+      #    --t switch
+      @track = track
+      name, remote = name.split(' ').first.split('/').reverse
+      if remote
+        @remote = Git::Remote.new(@base, remote)
+        name = "#{remote}/#{name}"
       end
+      @name = name
+      #
     end
     
     def gcommit
@@ -93,7 +98,9 @@ def to_s
     private 
 
       def check_if_create
-        @base.lib.branch_new(@name) rescue nil
+        # -- addition of track attribute
+        @base.lib.branch_new(@name, @track) rescue nil
+        #
       end
       
       def determine_current
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -478,11 +478,15 @@ def stash_clear
     def stash_list
       command('stash list')
     end
-    
-    def branch_new(branch)
-      command('branch', branch)
+
+    # -- implement --t switch on git branch command
+    def branch_new(branch, track=nil)
+      options = [branch]
+      options << '--t' << track if track
+      command('branch', options)
     end
-    
+    #
+
     def branch_delete(branch)
       command('branch', ['-D', branch])
     end
