Patch version bump. Git pull is a fetch and merge, but it needs to merge the remote - otherwise there is nothing to merge

TJ Biddle · TJ Biddle · commit a0afc0eb90dd · 2012-09-20T14:16:56.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.6"
+  s.version = "1.2.7"
 
   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
@@ -322,7 +322,10 @@ def each_conflict(&block) # :yields: file, your_version, their_version
     # 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(branch, message)
+      old_branch = self.lib.branch_current
+      if self.lib.branch_current != branch then checkout(branch) end
+      merge(remote, message)
+      if self.lib.branch_current != branch then checkout(old_branch) end
     end
     
     # returns an array of Git:Remote objects
