Skip to content

Allow fetch operation to receive a ref param #362

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 8 commits into from
Jun 25, 2018
Merged

Allow fetch operation to receive a ref param #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c16862b
Allow fetch operation to receive a `ref` param
Apr 19, 2018
d9f7da0
Update remote object
Apr 19, 2018
37fede4
remove .ruby-version
Apr 19, 2018
1510bce
Use options instead of separate param
Jun 19, 2018
eac3010
Merge branch 'master' into custom_fetch
taquitos Jun 19, 2018
c413f21
Update for comments
Jun 19, 2018
f361b5d
Merge branch 'master' into custom_fetch
taquitos Jun 20, 2018
33c9f1d
Update for style
Jun 21, 2018
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ And here are the operations that will need to write to your git repository.

g.fetch
g.fetch(g.remotes.first)
g.fetch('origin', {:ref => 'some/ref/head'} )

g.pull
g.pull(Git::Repo, Git::Branch) # fetch and a merge
Expand Down
1 change: 1 addition & 0 deletions lib/git/lib.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,6 +738,7 @@ def tag(name, *opts)

def fetch(remote, opts)
arr_opts = [remote]
arr_opts << opts[:ref] if opts[:ref]
arr_opts << '--tags' if opts[:t] || opts[:tags]
arr_opts << '--prune' if opts[:p] || opts[:prune]

Expand Down
28 changes: 28 additions & 0 deletions tests/units/test_remotes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,34 @@ def test_fetch
assert(loc.tags.map(&:name).include?('test-tag-in-deleted-branch'))
end
end

def test_fetch_ref_adds_ref_option
in_temp_dir do |path|
loc = Git.clone(@wbare, 'local')
rem = Git.clone(@wbare, 'remote', :config => 'receive.denyCurrentBranch=ignore')
loc.add_remote('testrem', rem)

loc.chdir do
new_file('test-file1', 'gonnaCommitYou')
loc.add
loc.commit('master commit 1')
first_commit_sha = loc.log.first.sha

new_file('test-file2', 'gonnaCommitYouToo')
loc.add
loc.commit('master commit 2')
second_commit_sha = loc.log.first.sha

# Make sure fetch message only has the first commit when we fetch the first commit
assert(loc.fetch('origin', {:ref => first_commit_sha}).include?(first_commit_sha))
assert(!loc.fetch('origin', {:ref => first_commit_sha}).include?(second_commit_sha))

# Make sure fetch message only has the second commit when we fetch the second commit
assert(loc.fetch('origin', {:ref => second_commit_sha}).include?(second_commit_sha))
assert(!loc.fetch('origin', {:ref => second_commit_sha}).include?(first_commit_sha))
end
end
end

def test_push
in_temp_dir do |path|
Expand Down