From 1dfc01b91397126cf8aff4e4ae125e32791dec8c Mon Sep 17 00:00:00 2001 From: Geoff Davis Date: Tue, 11 Jun 2013 15:55:20 -0600 Subject: [PATCH] Fix merge branch in pull The merge was happening against a local branch rather than the remote branch. --- lib/git/base.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/git/base.rb b/lib/git/base.rb index dd9b6bb7..10dd5858 100644 --- a/lib/git/base.rb +++ b/lib/git/base.rb @@ -333,8 +333,9 @@ 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') + remote_branch fetch(remote) - merge(branch, message) + merge("remotes/#{remote}/#{branch}", message) end # returns an array of Git:Remote objects