Sync main branch with upstream changes

README.md

@@ -15,7 +15,7 @@ Create Pull Request action will:
    - tracked (modified) files
    - commits made during the workflow that have not been pushed
 2. Commit all changes to a new branch, or update an existing pull request branch.
-3. Create a pull request to merge the new branch into the base—the branch checked out in the workflow.
+3. Create or update a pull request to merge the branch into the base—the branch checked out in the workflow.
 
 ## Documentation
 
@@ -99,7 +99,7 @@ Other token options:
 #### branch-token
 
 The action first creates a branch, and then creates a pull request for the branch.
-For some rare use cases it can be useful, or even neccessary, to use different tokens for these operations.
+For some rare use cases it can be useful, or even necessary, to use different tokens for these operations.
 It is not advisable to use this input unless you know you need to.
 
 #### commit-message
@@ -246,26 +246,6 @@ Note that the repository must be checked out on a branch with a remote, it won't
         uses: peter-evans/create-pull-request@v7
 ```
 
-<!--
-### Create a project card
-
-To create a project card for the pull request, pass the `pull-request-number` step output to [create-or-update-project-card](https://github.com/peter-evans/create-or-update-project-card) action.
-
-```yml
-      - name: Create Pull Request
-        id: cpr
-        uses: peter-evans/create-pull-request@v7
-
-      - name: Create or Update Project Card
-        if: ${{ steps.cpr.outputs.pull-request-number }}
-        uses: peter-evans/create-or-update-project-card@v2
-        with:
-          project-name: My project
-          column-name: My column
-          issue-number: ${{ steps.cpr.outputs.pull-request-number }}
-```
--->
-
 ### Auto-merge
 
 Auto-merge can be enabled on a pull request allowing it to be automatically merged once requirements have been satisfied.

__test__/create-or-update-branch.int.test.ts

@@ -250,11 +250,15 @@ describe('create-or-update-branch tests', () => {
     expect(branchCommits.length).toEqual(1)
     expect(branchCommits[0].subject).toEqual('Test changes')
     expect(branchCommits[0].changes.length).toEqual(3)
-    expect(branchCommits[0].changes).toEqual([
-      {mode: '100755', path: UNTRACKED_EXE_FILE, status: 'A'},
-      {mode: '100644', path: TRACKED_FILE, status: 'M'},
-      {mode: '100644', path: UNTRACKED_FILE, status: 'A'}
-    ])
+    expect(branchCommits[0].changes[0].mode).toEqual('100755')
+    expect(branchCommits[0].changes[0].path).toEqual(UNTRACKED_EXE_FILE)
+    expect(branchCommits[0].changes[0].status).toEqual('A')
+    expect(branchCommits[0].changes[1].mode).toEqual('100644')
+    expect(branchCommits[0].changes[1].path).toEqual(TRACKED_FILE)
+    expect(branchCommits[0].changes[1].status).toEqual('M')
+    expect(branchCommits[0].changes[2].mode).toEqual('100644')
+    expect(branchCommits[0].changes[2].path).toEqual(UNTRACKED_FILE)
+    expect(branchCommits[0].changes[2].status).toEqual('A')
   })
 
   it('tests buildBranchCommits with addition and deletion', async () => {
@@ -272,11 +276,15 @@ describe('create-or-update-branch tests', () => {
     expect(branchCommits.length).toEqual(1)
     expect(branchCommits[0].subject).toEqual('Test changes')
     expect(branchCommits[0].changes.length).toEqual(3)
-    expect(branchCommits[0].changes).toEqual([
-      {mode: '100644', path: TRACKED_FILE, status: 'D'},
-      {mode: '100644', path: UNTRACKED_FILE, status: 'A'},
-      {mode: '100644', path: TRACKED_FILE_NEW_PATH, status: 'A'}
-    ])
+    expect(branchCommits[0].changes[0].mode).toEqual('100644')
+    expect(branchCommits[0].changes[0].path).toEqual(TRACKED_FILE)
+    expect(branchCommits[0].changes[0].status).toEqual('D')
+    expect(branchCommits[0].changes[1].mode).toEqual('100644')
+    expect(branchCommits[0].changes[1].path).toEqual(UNTRACKED_FILE)
+    expect(branchCommits[0].changes[1].status).toEqual('A')
+    expect(branchCommits[0].changes[2].mode).toEqual('100644')
+    expect(branchCommits[0].changes[2].path).toEqual(TRACKED_FILE_NEW_PATH)
+    expect(branchCommits[0].changes[2].status).toEqual('A')
   })
 
   it('tests buildBranchCommits with multiple commits', async () => {
@@ -294,10 +302,13 @@ describe('create-or-update-branch tests', () => {
       expect(branchCommits[i].subject).toEqual(`Test changes ${i}`)
       expect(branchCommits[i].changes.length).toEqual(2)
       const untrackedFileStatus = i == 0 ? 'A' : 'M'
-      expect(branchCommits[i].changes).toEqual([
-        {mode: '100644', path: TRACKED_FILE, status: 'M'},
-        {mode: '100644', path: UNTRACKED_FILE, status: untrackedFileStatus}
-      ])
+
+      expect(branchCommits[i].changes[0].mode).toEqual('100644')
+      expect(branchCommits[i].changes[0].path).toEqual(TRACKED_FILE)
+      expect(branchCommits[i].changes[0].status).toEqual('M')
+      expect(branchCommits[i].changes[1].mode).toEqual('100644')
+      expect(branchCommits[i].changes[1].path).toEqual(UNTRACKED_FILE)
+      expect(branchCommits[i].changes[1].status).toEqual(untrackedFileStatus)
     }
   })
 

__test__/entrypoint.sh

@@ -19,14 +19,17 @@ git clone git://127.0.0.1/repos/test-base.git /git/local/repos/test-base
 cd /git/local/repos/test-base
 git config --global user.email "you@example.com"
 git config --global user.name "Your Name"
-echo "#test-base" > README.md
+echo "#test-base" > README→TEMP.md
 git add .
 git commit -m "initial commit"
 git commit --allow-empty -m "empty commit for tests"
-echo "#test-base :sparkles:" > README.md
+echo "#test-base :sparkles:" > README→TEMP.md
 git add .
 git commit -m "add sparkles" -m "Change description:
-- updates README.md to add sparkles to the title"
+- updates README→TEMP.md to add sparkles to the title"
+mv README→TEMP.md README.md
+git add .
+git commit -m "rename readme"
 git push -u
 git log -1 --pretty=oneline
 git config --global --unset user.email

__test__/git-command-manager.int.test.ts

@@ -11,27 +11,38 @@ describe('git-command-manager integration tests', () => {
   })
 
   it('tests getCommit', async () => {
-    const initialCommit = await git.getCommit('HEAD^^')
-    const emptyCommit = await git.getCommit('HEAD^')
+    const initialCommit = await git.getCommit('HEAD^^^')
+    const emptyCommit = await git.getCommit('HEAD^^')
+    const modifiedCommit = await git.getCommit('HEAD^')
     const headCommit = await git.getCommit('HEAD')
 
     expect(initialCommit.subject).toEqual('initial commit')
     expect(initialCommit.signed).toBeFalsy()
-    expect(initialCommit.changes).toEqual([
-      {mode: '100644', status: 'A', path: 'README.md'}
-    ])
+    expect(initialCommit.changes[0].mode).toEqual('100644')
+    expect(initialCommit.changes[0].status).toEqual('A')
+    expect(initialCommit.changes[0].path).toEqual('README→TEMP.md') // filename contains unicode
 
     expect(emptyCommit.subject).toEqual('empty commit for tests')
     expect(emptyCommit.tree).toEqual(initialCommit.tree) // empty commits have no tree and reference the parent's
     expect(emptyCommit.parents[0]).toEqual(initialCommit.sha)
     expect(emptyCommit.signed).toBeFalsy()
     expect(emptyCommit.changes).toEqual([])
 
-    expect(headCommit.subject).toEqual('add sparkles')
-    expect(headCommit.parents[0]).toEqual(emptyCommit.sha)
+    expect(modifiedCommit.subject).toEqual('add sparkles')
+    expect(modifiedCommit.parents[0]).toEqual(emptyCommit.sha)
+    expect(modifiedCommit.signed).toBeFalsy()
+    expect(modifiedCommit.changes[0].mode).toEqual('100644')
+    expect(modifiedCommit.changes[0].status).toEqual('M')
+    expect(modifiedCommit.changes[0].path).toEqual('README→TEMP.md')
+
+    expect(headCommit.subject).toEqual('rename readme')
+    expect(headCommit.parents[0]).toEqual(modifiedCommit.sha)
     expect(headCommit.signed).toBeFalsy()
-    expect(headCommit.changes).toEqual([
-      {mode: '100644', status: 'M', path: 'README.md'}
-    ])
+    expect(headCommit.changes[0].mode).toEqual('100644')
+    expect(headCommit.changes[0].status).toEqual('A')
+    expect(headCommit.changes[0].path).toEqual('README.md')
+    expect(headCommit.changes[1].mode).toEqual('100644')
+    expect(headCommit.changes[1].status).toEqual('D')
+    expect(headCommit.changes[1].path).toEqual('README→TEMP.md')
   })
 })