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

Jump to bottom

a more robust merge script #375

Closed
wants to merge 1 commit into from
Closed

a more robust merge script #375

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions bin/git-pull-request.rb
View file
Open in desktop
Expand Up @@ -207,7 +207,9 @@ def merge(number)
user_login = pull_request['user']['login']
user_obj = Github.get("users/#{user_login}")
user_name = user_obj['name']
user_name = user_login if user_name.nil? || user_name.empty?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can do this:
user_name = user_obj['name'] || user_login

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that only works if the value is nil or false

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. Shipit!

user_email = user_obj['email']
user_email = user_login if user_email.nil? || user_email.empty?

puts "Committing"
Git.commit("--author=\"#{user_name} <#{user_email}>\" -m #{Shellwords.escape(commit_msg)} -e")
Expand Down