refactor: rename default branch to main

syndesisio · Oct 6, 2021 · 5e462aa · 5e462aa
1 parent eebb928
commit 5e462aa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -15,5 +15,6 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - run: |
+         git config --global init.defaultBranch main
          curl -fsSL https://git.io/shellspec | sh -s -- --yes
          ${HOME}/.local/bin/shellspec
diff --git a/spec/backport_spec.sh b/spec/backport_spec.sh
@@ -70,7 +70,7 @@ http_post invoked with: comments-url {"body":"message\n\n<details><summary>Error
         echo modified > file
         git commit -q -m change file
         commit="$(git rev-parse HEAD)"
-        git checkout -q master
+        git checkout -q main
         git merge -q --no-ff --commit "${commit}"
         merge_commit_sha="$(git rev-parse HEAD)"
       }
@@ -102,11 +102,11 @@ http_post invoked with: comments-url {"body":"message\n\n<details><summary>Error
         echo conflict > file
         git add file
         git commit -q -m conflict
-        git checkout -q -b feature master
+        git checkout -q -b feature main
         echo modified > file
         git commit -q -m change file
         commit="$(git rev-parse HEAD)"
-        git checkout -q master
+        git checkout -q main
         git merge -q --no-ff --commit "${commit}"
         merge_commit_sha="$(git rev-parse HEAD)"
       }
@@ -187,6 +187,7 @@ http_post invoked with:comments-url {\"body\":\"Unable to cherry-pick commit * o
       git init -q
       git config user.name testuser
       git config user.email test@example.com
+      git config init.defaultBranch main
       echo initial > file
       git add file
       git commit -q -m initial file