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.

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

Modify the branch name in github for push #20

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ With `cf`:
$ cd github-service-broker-ruby/example_app/
$ cf push github-consumer
$ cf create-service github-repo public github-repo-1
$ cf bind-service github-repo-1 github-consumer
$ cf bind-service github-consumer github-repo-1
$ cf services # can be used to verify the binding was created
$ cf restart github-consumer
```
Expand Down
6 changes: 3 additions & 3 deletions example_app/github_repo_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ def credentials_for_repo_uri(uri)
# - configure git ssh (known hosts, and private key file)
# - clone the repo
# - set git author
# - check out master
# - check out main branch
# - create empty commit
# - print the commit log
# - push commit to master
# - push commit to main branch
# - delete private key
# - delete ssh script
# - delete cloned directory
Expand Down Expand Up @@ -93,7 +93,7 @@ def shell_create_and_push_commit(repo_credentials, application_name)
"cd #{temp_dir}/#{repo_name} && git config user.email '#{application_name}@example.com' 2>&1",
"cd #{temp_dir}/#{repo_name} && git commit --allow-empty -m 'auto generated empty commit' 2>&1",
"cd #{temp_dir}/#{repo_name} && git log --pretty=format:\"%h%x09%ad%x09%s\" 2>&1",
"cd #{temp_dir}/#{repo_name}; GIT_SSH=#{git_ssh_script} git push origin master 2>&1"
"cd #{temp_dir}/#{repo_name}; GIT_SSH=#{git_ssh_script} git push origin main 2>&1"
]

return_code = 0
Expand Down