Skip to content

Commit

Permalink
Move default branches from master to main
Browse files Browse the repository at this point in the history
[#175857895]

Authored-by: Sarah Weinstein <[email protected]>
  • Loading branch information
sweinstein22 committed Dec 9, 2020
1 parent 38073be commit 2439e75
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Or curl the bootstrap script, which will create the `workspace` directory and cl
This is primarily intended for quickly setting up virtual workstations.

```
bash <(curl -s https://raw.githubusercontent.com/cloudfoundry/capi-workspace/master/bootstrap.sh)
bash <(curl -s https://raw.githubusercontent.com/cloudfoundry/capi-workspace/main/bootstrap.sh)
```
**Make sure you ssh in as the "pivotal" user**

Expand Down
6 changes: 3 additions & 3 deletions assets/gitconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[alias]
blog = "loga origin/master... --left-right"
blog = "loga origin/main... --left-right"
br = branch
ci = commit --verbose
co = checkout
Expand All @@ -15,8 +15,8 @@
lol = "log --graph --decorate --oneline"
lola = "log --graph --decorate --oneline --all"
ri = rebase --interactive
rio = rebase --interactive origin/master
rum = "rebase master@{u}"
rio = rebase --interactive origin/main
rum = "rebase main@{u}"
s = status --short --branch
solo = author
pair = author
Expand Down
4 changes: 2 additions & 2 deletions bin/git-open
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,8 @@ openurl="$protocol://$domain/$urlpath"
if (( is_commit )); then
sha=$(git rev-parse HEAD)
openurl="$openurl/commit/$sha"
elif [[ $remote_ref != "master" ]]; then
# simplify URL for master
elif [[ $remote_ref != "main" ]]; then
# simplify URL for main
openurl="$openurl$providerBranchRef"
fi

Expand Down
2 changes: 1 addition & 1 deletion bin/which_capi
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function first_release_with_sha {
function display_pre_release_branches_with_sha {
declare search_sha=$1

declare -a branches=("origin/ci-passed" "origin/master" "origin/develop")
declare -a branches=("origin/ci-passed" "origin/main" "origin/develop")
local branch
local result

Expand Down
2 changes: 1 addition & 1 deletion bootstrap.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# run this script on newly provisions VMs to create remote workstations
# bash <(curl -s https://raw.githubusercontent.com/cloudfoundry/capi-workspace/master/bootstrap.sh)
# bash <(curl -s https://raw.githubusercontent.com/cloudfoundry/capi-workspace/main/bootstrap.sh)

mkdir -p ~/workspace
cd ~/workspace
Expand Down

0 comments on commit 2439e75

Please sign in to comment.