Updating pull method to do a normal git pull with it's remove and branch specified rather than do a fetch and merge.

TJ Biddle · TJ Biddle · commit 129e798a8df3 · 2013-03-19T17:29:54.000-07:00
diff --git a/git.gemspec b/git.gemspec
@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git}
-  s.version = "1.2.7"
+  s.version = "1.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Chacon"]
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -320,9 +320,8 @@ def each_conflict(&block) # :yields: file, your_version, their_version
     end
 
     # fetches a branch from a remote and merges it into the current working branch
-    def pull(remote = 'origin', branch = 'master', message = 'origin pull')
-      fetch(remote)
-      merge(remote, message)
+    def pull(remote = 'origin', branch = 'master')
+      self.lib.pull(remote, branch)
     end
     
     # returns an array of Git:Remote objects
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -507,6 +507,10 @@ def merge(branch, message = nil, arr_opts = [])
       command('merge', arr_opts)
     end
 
+    def pull(remote, branch)
+      command('pull', [remote, branch])
+    end
+
     def unmerged
       unmerged = []
       command_lines('diff', ["--cached"]).each do |line|
