Pull doesn't work about ruby-git HOT 8 CLOSED

Same issue happened here!

from ruby-git.

Same, @alexspeller thanks for the workaround, @schacon fix your cracky stone

from ruby-git.

Same problems here, thanks for workaround

from ruby-git.

Same issue here as well, @alexspeller thanks for the workaround

from ruby-git.

Hi. I've debug this one.
Git does the following:
git fetch origin # problem goes here
git merge -m "Origin pull" master

Look like git requires to explicity provide branch name when fetching.
So I did the following hack. Just include this code in your project:

# Hack
module Git
  class Base
    def pull(remote = 'origin', branch = 'master', message = 'origin pull')
      fetch(remote, branch)
      merge(branch, message)
    end

    def fetch(remote = 'origin', branch = 'master')
      self.lib.fetch(remote, branch)
    end
  end

  class Lib
    def fetch(remote, branch = 'master')
      command('fetch', [remote, branch])
    end
  end
end

An update: it is not clear for me why library transforms git pull into git fetch and git merge. Deciding what is better git pull or git fetch + merge is up to user I think.

from ruby-git.

It is very odd because yesterday hack above works but today it doesn't work :(
I'm trying to figure out why

Now it works and looks like:

# Hack
module Git
  class Base
    def pull
      self.lib.pull
    end
  end

  class Lib
    def pull
      command('pull')
    end
  end
end

I've decided to use directly pull command

from ruby-git.

+1 @schacon What's the reasoning behind this? Should we submit a patch?

from ruby-git.

👍 thanks, @robertodecurnex, solution is simple.. or and btw, B-) FIRST! :P

from ruby-git.