chore: update default branch references from "master" to "main"

iiroj · iiroj · commit 7b8be705e29c · 2025-02-27T10:45:41.000+02:00
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -2,5 +2,5 @@
   "$schema": "https://unpkg.com/@changesets/config@2.3.1/schema.json",
   "changelog": ["@changesets/changelog-github", { "repo": "okonet/lint-staged" }],
   "access": "public",
-  "baseBranch": "master"
+  "baseBranch": "main"
 }
diff --git a/.changeset/sour-taxis-buy.md b/.changeset/sour-taxis-buy.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -3,13 +3,13 @@ name: Security Analysis
 on:
   push:
     branches:
-      - master
+      - main
   schedule:
     - cron: '0 0 * * 1' # 00:00 on Monday.
   workflow_call:
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   CodeQL:
diff --git a/.github/workflows/default-branch-push.yml b/.github/workflows/default-branch-push.yml
@@ -3,7 +3,7 @@ name: Default Branch Push
 on:
   push:
     branches:
-      - master
+      - main
     # Do not run on tags
     tags-ignore:
       - '*'
diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
@@ -3,7 +3,7 @@ name: Pull Requests
 on:
   pull_request:
     branches:
-      - master
+      - main
 
 permissions:
   contents: read
diff --git a/README.md b/README.md
@@ -909,15 +909,15 @@ all changed files between two different branches. If you want to run _lint-stage
 Try out the `git diff` command until you are satisfied with the result, for example:
 
 ```
-git diff --diff-filter=ACMR --name-only master...my-branch
+git diff --diff-filter=ACMR --name-only main...my-branch
 ```
 
-This will print a list of _added_, _changed_, _modified_, and _renamed_ files between `master` and `my-branch`.
+This will print a list of _added_, _changed_, _modified_, and _renamed_ files between `main` and `my-branch`.
 
 You can then run lint-staged against the same files with:
 
 ```
-npx lint-staged --diff="master...my-branch"
+npx lint-staged --diff="main...my-branch"
 ```
 
 </details>
diff --git a/test/e2e/no-stash.test.js b/test/e2e/no-stash.test.js
@@ -31,16 +31,16 @@ describe('lint-staged', () => {
       expect(res.stdout).toMatch('No staged files found.')
       expect(res.stderr).toMatch('Skipping backup because `--no-stash` was used.')
 
-      res = await lintStaged('--diff=master...my-branch')
+      res = await lintStaged('--diff=main...my-branch')
       expect(res.stderr).toMatch('Skipping backup because `--diff` was used.')
 
-      await expect(lintStaged('--diff=master...my-branch --stash')).rejects.toThrow(
+      await expect(lintStaged('--diff=main...my-branch --stash')).rejects.toThrow(
         expect.objectContaining({
           stderr: expect.stringContaining('lint-staged failed due to a git error.'),
         })
       )
 
-      res = await lintStaged('--diff=master...my-branch --no-stash')
+      res = await lintStaged('--diff=main...my-branch --no-stash')
       expect(res.stderr).toMatch('Skipping backup because `--diff` was used.')
     })
   )
diff --git a/test/integration/__utils__/withGitIntegration.js b/test/integration/__utils__/withGitIntegration.js
@@ -105,7 +105,7 @@ export const withGitIntegration =
     const utils = getGitUtils(cwd)
 
     // Init repository with initial commit
-    await utils.execGit(['init', '--initial-branch', 'master'])
+    await utils.execGit(['init', '--initial-branch', 'main'])
 
     if (isWindowsActions()) {
       await utils.execGit(['config', 'core.autocrlf', 'input'])
diff --git a/test/integration/merge-conflict.test.js b/test/integration/merge-conflict.test.js
@@ -28,7 +28,7 @@ describe('lint-staged', () => {
 
       expect(await readFile('test.js')).toEqual(fileInBranchA)
 
-      await execGit(['checkout', 'master'])
+      await execGit(['checkout', 'main'])
 
       // Create another branch
       await execGit(['checkout', '-b', 'branch-b'])
@@ -39,7 +39,7 @@ describe('lint-staged', () => {
       expect(await readFile('test.js')).toEqual(fileInBranchBFixed)
 
       // Merge first branch
-      await execGit(['checkout', 'master'])
+      await execGit(['checkout', 'main'])
       await execGit(['merge', 'branch-a'])
       expect(await readFile('test.js')).toEqual(fileInBranchA)
       expect(await execGit(['log', '-1', '--pretty=%B'])).toMatch('commit a')
@@ -90,7 +90,7 @@ describe('lint-staged', () => {
 
       expect(await readFile('test.js')).toEqual(fileInBranchA)
 
-      await execGit(['checkout', 'master'])
+      await execGit(['checkout', 'main'])
 
       // Create another branch
       await execGit(['checkout', '-b', 'branch-b'])
@@ -103,7 +103,7 @@ describe('lint-staged', () => {
       expect(await readFile('test.js')).toEqual(fileInBranchBFixed)
 
       // Merge first branch
-      await execGit(['checkout', 'master'])
+      await execGit(['checkout', 'main'])
       await execGit(['merge', 'branch-a'])
       expect(await readFile('test.js')).toEqual(fileInBranchA)
       expect(await execGit(['log', '-1', '--pretty=%B'])).toMatch('commit a')
@@ -220,7 +220,7 @@ describe('lint-staged', () => {
       await execGit(['commit', '-m', 'Local changes'])
 
       // Initiate merge with conflict
-      await expect(execGit(['merge', 'master'])).rejects.toThrow('Merge conflict')
+      await expect(execGit(['merge', 'main'])).rejects.toThrow('Merge conflict')
 
       expect(await execGit(['status', '--porcelain'])).toMatchInlineSnapshot(`
         "UU modifiedFileConflictDiscardLocal.js
diff --git a/test/integration/no-initial-commit.test.js b/test/integration/no-initial-commit.test.js
@@ -18,7 +18,7 @@ describe('lint-staged', () => {
         await execGit(['add', 'test.js'], { cwd })
 
         await expect(execGit(['log', '-1'], { cwd })).rejects.toThrowErrorMatchingInlineSnapshot(
-          `"fatal: your current branch 'master' does not have any commits yet"`
+          `"fatal: your current branch 'main' does not have any commits yet"`
         )
 
         expect(await gitCommit({})).toMatch('Skipping backup because there’s no initial commit yet')
diff --git a/test/unit/getStagedFiles.spec.js b/test/unit/getStagedFiles.spec.js
@@ -46,24 +46,24 @@ describe('getStagedFiles', () => {
 
   it('should support overriding diff trees with ...', async () => {
     execGit.mockImplementationOnce(async () => 'foo.js\u0000bar.js\u0000')
-    const staged = await getStagedFiles({ cwd: '/', diff: 'master...my-branch' })
+    const staged = await getStagedFiles({ cwd: '/', diff: 'main...my-branch' })
     // Windows filepaths
     expect(staged).toEqual([normalizeWindowsPath('/foo.js'), normalizeWindowsPath('/bar.js')])
 
     expect(execGit).toHaveBeenCalledWith(
-      ['diff', '--name-only', '-z', '--diff-filter=ACMR', 'master...my-branch'],
+      ['diff', '--name-only', '-z', '--diff-filter=ACMR', 'main...my-branch'],
       { cwd: '/' }
     )
   })
 
   it('should support overriding diff trees with multiple args', async () => {
     execGit.mockImplementationOnce(async () => 'foo.js\u0000bar.js\u0000')
-    const staged = await getStagedFiles({ cwd: '/', diff: 'master my-branch' })
+    const staged = await getStagedFiles({ cwd: '/', diff: 'main my-branch' })
     // Windows filepaths
     expect(staged).toEqual([normalizeWindowsPath('/foo.js'), normalizeWindowsPath('/bar.js')])
 
     expect(execGit).toHaveBeenCalledWith(
-      ['diff', '--name-only', '-z', '--diff-filter=ACMR', 'master', 'my-branch'],
+      ['diff', '--name-only', '-z', '--diff-filter=ACMR', 'main', 'my-branch'],
       { cwd: '/' }
     )
   })

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`	`"$schema": "https://unpkg.com/@changesets/config@2.3.1/schema.json",`
`3`	`3`	`"changelog": ["@changesets/changelog-github", { "repo": "okonet/lint-staged" }],`
`4`	`4`	`"access": "public",`
`5`		`- "baseBranch": "master"`
	`5`	`+ "baseBranch": "main"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ describe('lint-staged', () => {`
`18`	`18`	`await execGit(['add', 'test.js'], { cwd })`
`19`	`19`
`20`	`20`	`await expect(execGit(['log', '-1'], { cwd })).rejects.toThrowErrorMatchingInlineSnapshot(`
`21`		- `"fatal: your current branch 'master' does not have any commits yet"`
	`21`	+ `"fatal: your current branch 'main' does not have any commits yet"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`expect(await gitCommit({})).toMatch('Skipping backup because there’s no initial commit yet')`