Skip to content

#push without args should do same as git push without args #636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 2, 2023
Merged

#push without args should do same as git push without args #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions lib/git/base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,11 +374,8 @@ def fetch(remote = 'origin', opts = {})
#
# @git.config('remote.remote-name.push', 'refs/heads/master:refs/heads/master')
#
def push(remote = 'origin', branch = 'master', opts = {})
# Small hack to keep backwards compatibility with the 'push(remote, branch, tags)' method signature.
opts = {:tags => opts} if [true, false].include?(opts)

self.lib.push(remote, branch, opts)
def push(*args, **options)
self.lib.push(*args, **options)
end

# merges one or more branches into the current working branch
Expand Down
24 changes: 20 additions & 4 deletions lib/git/lib.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,20 +908,36 @@ def fetch(remote, opts)
command('fetch', *arr_opts)
end

def push(remote, branch = 'master', opts = {})
def push(remote = nil, branch = nil, opts = nil)
if opts.nil? && branch.instance_of?(Hash)
opts = branch
branch = nil
end

if opts.nil? && remote.instance_of?(Hash)
opts = remote
remote = nil
end

opts ||= {}

# Small hack to keep backwards compatibility with the 'push(remote, branch, tags)' method signature.
opts = {:tags => opts} if [true, false].include?(opts)

raise ArgumentError, "You must specify a remote if a branch is specified" if remote.nil? && !branch.nil?

arr_opts = []
arr_opts << '--mirror' if opts[:mirror]
arr_opts << '--delete' if opts[:delete]
arr_opts << '--force' if opts[:force] || opts[:f]
arr_opts << remote
arr_opts << remote if remote
arr_opts_with_branch = arr_opts.dup
arr_opts_with_branch << branch if branch

if opts[:mirror]
command('push', *arr_opts)
command('push', *arr_opts_with_branch)
else
command('push', *arr_opts, branch)
command('push', *arr_opts_with_branch)
command('push', '--tags', *arr_opts) if opts[:tags]
end
end
Expand Down
110 changes: 110 additions & 0 deletions tests/units/test_push.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
require 'test_helper'

class TestPush < Test::Unit::TestCase
test 'push with no args' do
expected_command_line = ['push']
git_cmd = :push
git_cmd_args = []
assert_command_line(expected_command_line, git_cmd, git_cmd_args)
end

test 'push with no args and options' do
expected_command_line = ['push', '--force']
git_cmd = :push
git_cmd_args = [force: true]
assert_command_line(expected_command_line, git_cmd, git_cmd_args)
end

test 'push with only a remote name' do
expected_command_line = ['push', 'origin']
git_cmd = :push
git_cmd_args = ['origin']
assert_command_line(expected_command_line, git_cmd, git_cmd_args)
end

test 'push with only a remote name and options' do
expected_command_line = ['push', '--force', 'origin']
git_cmd = :push
git_cmd_args = ['origin', force: true]
assert_command_line(expected_command_line, git_cmd, git_cmd_args)
end

test 'push with only a branch name' do
expected_command_line = ['push', 'master']
git_cmd = :push
git_cmd_args = [nil, 'origin']

in_temp_dir do
git = Git.init('.', initial_branch: 'master')
assert_raises(ArgumentError) { git.push(nil, 'master') }
end
end

test 'push with both remote and branch name' do
expected_command_line = ['push', 'origin', 'master']
git_cmd = :push
git_cmd_args = ['origin', 'master']
assert_command_line(expected_command_line, git_cmd, git_cmd_args)
end

test 'push with force: true' do
expected_command_line = ['push', '--force', 'origin', 'master']
git_cmd = :push
git_cmd_args = ['origin', 'master', force: true]
assert_command_line(expected_command_line, git_cmd, git_cmd_args)
end

test 'push with f: true' do
expected_command_line = ['push', '--force', 'origin', 'master']
git_cmd = :push
git_cmd_args = ['origin', 'master', f: true]
assert_command_line(expected_command_line, git_cmd, git_cmd_args)
end

test 'push with mirror: true' do
expected_command_line = ['push', '--force', 'origin', 'master']
git_cmd = :push
git_cmd_args = ['origin', 'master', f: true]
assert_command_line(expected_command_line, git_cmd, git_cmd_args)
end

test 'push with delete: true' do
expected_command_line = ['push', '--delete', 'origin', 'master']
git_cmd = :push
git_cmd_args = ['origin', 'master', delete: true]
assert_command_line(expected_command_line, git_cmd, git_cmd_args)
end

test 'push with tags: true' do
expected_command_line = ['push', '--tags', 'origin']
git_cmd = :push
git_cmd_args = ['origin', nil, tags: true]
assert_command_line(expected_command_line, git_cmd, git_cmd_args)
end

test 'when push succeeds an error should not be raised' do
in_temp_dir do
Git.init('remote.git', initial_branch: 'master', bare: true)

git = Git.clone('remote.git', 'local')
Dir.chdir 'local' do
File.write('File2.txt', 'hello world')
git.add('File2.txt')
git.commit('Second commit')
assert_nothing_raised { git.push }
end
end
end

test 'when push fails a Git::FailedError should be raised' do
in_temp_dir do
Git.init('remote.git', initial_branch: 'master', bare: true)

git = Git.clone('remote.git', 'local')
Dir.chdir 'local' do
# Pushing when there is nothing to push fails
assert_raises(Git::FailedError) { git.push }
end
end
end
end