Skip to content
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

[Review] Request from 'xystushi' @ 'xystushi/git-review/review_130812_send_pull_requests_to_upstream' #61

Merged
merged 12 commits into from
Aug 14, 2013
Merged

[Review] Request from 'xystushi' @ 'xystushi/git-review/review_130812_send_pull_requests_to_upstream' #61

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1ac1d0d
Remove newline from error message.
xystushi Jul 24, 2013
fafd986
Only build in Ruby 1.9.3 and 2.0.0.
xystushi Jul 24, 2013
e046cef
Run specs as rake's default task. Don't check in Gemfile.lock.
xystushi Jul 27, 2013
63a5698
The right key is access_token in Octokit::Client.
xystushi Aug 1, 2013
4cbca44
Check args before calling shift on it.
xystushi Aug 1, 2013
4f664b8
Add support to send pull request to upstream repo.
xystushi Aug 1, 2013
84d97d1
Include Gemfile.lock and add line feed at EOF.
xystushi Aug 2, 2013
62f7ee0
Correct namespacing for Internals module.
xystushi Aug 10, 2013
1fcebd1
Do not load duplicate config values.
xystushi Aug 12, 2013
8015cd6
Target_repo is parent repo if sending pull request to upstream.
xystushi Aug 12, 2013
3900f88
Refactor create_pull_request in Commands.
xystushi Aug 12, 2013
62810b9
Don't use `and`, use `&&` always.
xystushi Aug 12, 2013
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
Prev Previous commit
Next Next commit
Do not load duplicate config values.
  • Loading branch information
@xystushi
xystushi committed Aug 12, 2013
commit 1fcebd121069ea44c8637534fe3021934a1fe4bb
2 changes: 1 addition & 1 deletion lib/git-review/local.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ def load_config
@config = {}
config_list.split("\n").each do |line|
key, value = line.split(/=/, 2)
if @config[key]
if @config[key] && @config[key] != value
@config[key] = [@config[key]].flatten << value
else
@config[key] = value
Expand Down
8 changes: 7 additions & 1 deletion spec/git-review/local_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@
subject.load_config.should == {'foo' => ['bar', 'bar2'], 'baz' => 'qux'}
end

it 'does not keep duplicate values for a key' do
config = "foo=bar\nbaz=qux\nfoo=bar"
subject.stub(:config_list).and_return(config)
subject.load_config.should == {'foo' => 'bar', 'baz' => 'qux'}
end

end

describe '#branch_exists?' do
Expand Down Expand Up @@ -211,4 +217,4 @@

end

end
end