#pull with no options should do the same thing as git pull with no options (#633)

jcouball · web-flow · commit b40de7071d2c · 2023-03-01T13:21:58.000-08:00
Signed-off-by: James Couball &lt;jcouball@yahoo.com&gt;
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -399,7 +399,7 @@ def each_conflict(&block) # :yields: file, your_version, their_version
     #  @git.pull('upstream')              # pulls from upstream/master
     #  @git.pull('upstream', 'develope')  # pulls from upstream/develop
     #
-    def pull(remote='origin', branch='master')
+    def pull(remote = nil, branch = nil)
       self.lib.pull(remote, branch)
     end
 
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -926,8 +926,13 @@ def push(remote, branch = 'master', opts = {})
       end
     end
 
-    def pull(remote='origin', branch='master')
-      command('pull', remote, branch)
+    def pull(remote = nil, branch = nil)
+      raise ArgumentError, "You must specify a remote if a branch is specified" if remote.nil? && !branch.nil?
+
+      arr_opts = []
+      arr_opts << remote if remote
+      arr_opts << branch if branch
+      command('pull', *arr_opts)
     end
 
     def tag_sha(tag_name)
diff --git a/tests/units/test_pull.rb b/tests/units/test_pull.rb
@@ -0,0 +1,112 @@
+require 'test_helper'
+
+class TestPull < Test::Unit::TestCase
+
+  test 'pull with branch only should raise an ArgumentError' do
+    in_temp_dir do |path|
+      Dir.mkdir('remote')
+
+      Dir.chdir('remote') do
+        `git init --initial-branch=branch1`
+        File.write('README.md', 'Line 1')
+        `git add README.md`
+        `git commit -m "Initial commit"`
+      end
+
+      `git clone remote/.git local 2>&1`
+
+      Dir.chdir('local') do
+        git = Git.open('.')
+        assert_raises(ArgumentError) { git.pull(nil, 'branch1') }
+      end
+    end
+  end
+
+  test 'pull with no args should use the default remote and current branch name' do
+    in_temp_dir do |path|
+      Dir.mkdir('remote')
+
+      Dir.chdir('remote') do
+        `git init --initial-branch=branch1`
+        File.write('README.md', 'Line 1')
+        `git add README.md`
+        `git commit -m "Initial commit"`
+      end
+
+      `git clone remote/.git local 2>&1`
+
+      Dir.chdir('remote') do
+        File.open('README.md', 'a') { |f| f.write('Line 2') }
+        `git add README.md`
+        `git commit -m "Initial commit"`
+      end
+
+      Dir.chdir('local') do
+        git = Git.open('.')
+        assert_equal(1, git.log.size)
+        assert_nothing_raised { git.pull }
+        assert_equal(2, git.log.size)
+      end
+    end
+  end
+
+  test 'pull with one arg should use arg as remote and the current branch name' do
+    in_temp_dir do |path|
+      Dir.mkdir('remote')
+
+      Dir.chdir('remote') do
+        `git init --initial-branch=branch1`
+        File.write('README.md', 'Line 1')
+        `git add README.md`
+        `git commit -m "Initial commit"`
+      end
+
+      `git clone remote/.git local 2>&1`
+
+      Dir.chdir('remote') do
+        File.open('README.md', 'a') { |f| f.write('Line 2') }
+        `git add README.md`
+        `git commit -m "Initial commit"`
+      end
+
+      Dir.chdir('local') do
+        git = Git.open('.')
+        assert_equal(1, git.log.size)
+        assert_nothing_raised { git.pull('origin') }
+        assert_equal(2, git.log.size)
+      end
+    end
+  end
+
+  test 'pull with both remote and branch should use both' do
+    in_temp_dir do |path|
+      Dir.mkdir('remote')
+
+      Dir.chdir('remote') do
+        `git init --initial-branch=master`
+        File.write('README.md', 'Line 1')
+        `git add README.md`
+        `git commit -m "Initial commit"`
+      end
+
+      `git clone remote/.git local 2>&1`
+
+      Dir.chdir('remote') do
+        `git checkout -b feature1 2>&1`
+        File.write('feature1.md', 'Line 1')
+        `git add feature1.md`
+        `git commit -m "Implement feature 1"`
+        File.open('feature1.md', 'a') { |f| f.write('Line 2') }
+        `git add feature1.md`
+        `git commit -m "Implement feature 1, line 2"`
+      end
+
+      Dir.chdir('local') do
+        git = Git.open('.')
+        assert_equal(1, git.log.size)
+        assert_nothing_raised { git.pull('origin', 'feature1') }
+        assert_equal(3, git.log.size)
+      end
+    end
+  end
+end

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ def each_conflict(&block) # :yields: file, your_version, their_version`
`399`	`399`	`# @git.pull('upstream') # pulls from upstream/master`
`400`	`400`	`# @git.pull('upstream', 'develope') # pulls from upstream/develop`
`401`	`401`	`#`
`402`		`- def pull(remote='origin', branch='master')`
	`402`	`+ def pull(remote = nil, branch = nil)`
`403`	`403`	`self.lib.pull(remote, branch)`
`404`	`404`	`end`
`405`	`405`