feat: switch to use name status (#1230)

Co-authored-by: tj-actions[bot] <109116665+tj-actions-bot@users.noreply.github.com>
Co-authored-by: GitHub Action <action@github.com>

.eslintrc.json

@@ -60,6 +60,8 @@
     "@typescript-eslint/promise-function-async": "error",
     "@typescript-eslint/require-array-sort-compare": "error",
     "@typescript-eslint/restrict-plus-operands": "error",
+    "no-shadow": "off",
+    "@typescript-eslint/no-shadow": "error",
     "semi": "off",
     "filenames/match-regex": [
       "error",

.github/workflows/submodule-sync.yml

@@ -19,7 +19,7 @@ jobs:
           git submodule update --remote --recursive
       
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5.0.1
+        uses: peter-evans/create-pull-request@v5.0.2
         with:
           title: "Updated submodule"
           labels: "merge when passing"

.github/workflows/sync-release-version.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Run git-cliff
         uses: tj-actions/git-cliff@v1
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5.0.1
+        uses: peter-evans/create-pull-request@v5.0.2
         with:
           base: "main"
           labels: "merge when passing"

.github/workflows/test.yml

@@ -4,14 +4,31 @@ on:
   push:
     branches:
       - "**"
-  pull_request:
-    branches:
-      - main
-      - sec
   pull_request_review:
+     types: [edited, dismissed, submitted]
+  pull_request_target:
+  pull_request:
+    types:
+      - assigned
+      - unassigned
+      - labeled
+      - unlabeled
+      - opened
+      - edited
+      - closed
+      - reopened
+      - synchronize
+      - converted_to_draft
+      - ready_for_review
+      - locked
+      - unlocked
+      - review_requested
+      - review_request_removed
+      - auto_merge_enabled
+      - auto_merge_disabled
     branches:
       - main
-      - sec
+
 
 jobs:
   shellcheck:
@@ -31,6 +48,7 @@ jobs:
         with:
           persist-credentials: false
           fetch-depth: 0
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - name: Use Node.js 16.x
         uses: actions/setup-node@v3.6.0
@@ -60,7 +78,7 @@ jobs:
           yarn all
 
       - name: Verify Changed files
-        uses: tj-actions/verify-changed-files@v14
+        uses: tj-actions/verify-changed-files@v15
         id: changed_files
         if: github.event_name != 'push'
         with:
@@ -78,6 +96,7 @@ jobs:
 
       - name: Push changes
         if: steps.changed_files.outputs.files_changed == 'true' && github.event_name == 'pull_request'
+        continue-on-error: true
         uses: ad-m/github-push-action@master
         with:
           github_token: ${{ secrets.PAT_TOKEN }}
@@ -104,6 +123,7 @@ jobs:
       - name: Checkout into dir1
         uses: actions/checkout@v3
         with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
           submodules: true
           fetch-depth: 0
           path: dir1
@@ -136,6 +156,7 @@ jobs:
       - name: Checkout into dir2
         uses: actions/checkout@v3
         with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
           submodules: true
           fetch-depth: 0
           path: dir2
@@ -170,6 +191,7 @@ jobs:
       - name: Checkout to branch
         uses: actions/checkout@v3
         with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
           fetch-depth: 0
 
       - name: Download build assets
@@ -226,6 +248,7 @@ jobs:
       - name: Checkout to branch
         uses: actions/checkout@v3
         with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
           fetch-depth: 0
 
       - name: Download build assets
@@ -262,6 +285,7 @@ jobs:
       - name: Checkout to branch
         uses: actions/checkout@v3
         with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
           fetch-depth: 0
 
       - name: Download build assets
@@ -297,6 +321,7 @@ jobs:
       - name: Checkout to branch
         uses: actions/checkout@v3
         with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
           fetch-depth: ${{ matrix.fetch-depth }}
 
       - name: Download build assets
@@ -360,6 +385,7 @@ jobs:
         with:
           fetch-depth: ${{ matrix.fetch-depth }}
           persist-credentials: false
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - name: Download build assets
         uses: actions/download-artifact@v3
@@ -541,6 +567,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: true
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
           fetch-depth: ${{ matrix.fetch-depth }}
       - name: Download build assets
         uses: actions/download-artifact@v3
@@ -1231,7 +1258,7 @@ jobs:
           main-branch-name: ${{ steps.branch-name.outputs.base_ref_branch }}
           workflow-id: 'test.yml'
       - name: Run changed-files with a custom base sha
-        if: github.event_name != 'push' && github.event.action != 'closed' && matrix.fetch-depth == 0
+        if: github.event_name != 'push' && github.event.action != 'closed' && matrix.fetch-depth == 0 && steps.last_successful_commit.outputs.base != steps.last_successful_commit.outputs.head
         id: changed-files-custom-base-sha
         uses: ./
         with:

.github/workflows/update-readme.yml

@@ -20,7 +20,7 @@ jobs:
         uses: tj-actions/remark@v3
 
       - name: Verify Changed files
-        uses: tj-actions/verify-changed-files@v14
+        uses: tj-actions/verify-changed-files@v15
         id: verify_changed_files
         with:
           files: |

README.md

@@ -19,7 +19,7 @@
 
 ## changed-files
 
-Retrieve all changed files and directories relative to a target branch, preceeding commit or the last remote commit returning a **relative path** from the project root.
+Retrieve all changed files and directories relative to a target branch, preceeding commit or the last remote commit returning **relative paths** from the project root.
 
 ## Table of contents
 
@@ -45,7 +45,8 @@ Retrieve all changed files and directories relative to a target branch, preceedi
 *   Supports Git submodules.
 *   Escaped JSON output which can be used to run matrix jobs based on changed files.
 *   List changed directories.
-    *   Restrict the max depth of matching changed directories.
+    *   Limit the matching changed directories to a maximum depth.
+    *   Optionally exclude the current directory
 *   Write outputs to a `.txt` or `.json` file at a specified location for further processing.
 *   Monorepos (Fetches a fixed number of commits).
 *   Supports all platforms (Linux, MacOS, Windows).
@@ -70,6 +71,7 @@ Retrieve all changed files and directories relative to a target branch, preceedi
 > *   For monorepos where pulling all the branch history might not be desired, you can omit [`actions/checkout`](https://github.com/actions/checkout#usage) - `fetch-depth` for `pull_request` events.
 > *   All multiline inputs should not use double or single quotes since the value is already a string seperated by a newline character. See [Examples](#examples) for more information.
 > *   Ensure that `persist-credentials` is set to `true` when configuring [`actions/checkout`](https://github.com/actions/checkout#usage) if `fetch-depth` isn't set to `0`.
+> *   For repositories that have PR's generated from forks when configuring [`actions/checkout`](https://github.com/actions/checkout#usage) set the `repository` to `${{ github.event.pull_request.head.repo.full_name }}`. See: [Example](https://github.com/tj-actions/changed-files/blob/main/.github/workflows/test.yml#L47-L51)
 
 ```yaml
 name: CI
@@ -170,29 +172,29 @@ Support this project with a :star:
 
 <!-- AUTO-DOC-OUTPUT:START - Do not remove or modify this section -->
 
-|             OUTPUT             |  TYPE  |                                                                                               DESCRIPTION                                                                                                |
-|--------------------------------|--------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-|          added\_files           | string |                                                                               Returns only files that are <br>Added (A).                                                                                 |
-| all\_changed\_and\_modified\_files | string |                                                              Returns all changed and modified <br>files i.e. *a combination of (ACMRDTUX)*                                                               |
-|       all\_changed\_files        | string |                                               Returns all changed files i.e. <br>*a combination of all added, copied, modified and renamed files (ACMR)*                                                 |
-|       all\_modified\_files       | string |                                          Returns all changed files i.e. <br>*a combination of all added, copied, modified, renamed and deleted files (ACMRD)*.                                           |
-|   all\_old\_new\_renamed\_files    | string |                 Returns only files that are <br>Renamed and list their old <br>and new names. **NOTE:** This <br>requires setting `include_all_old_new_renamed_files` to `true` <br>(R)                  |
-|          any\_changed           | string |         Returns `true` when any of <br>the filenames provided using the <br>`files` input has changed. i.e. <br>*using a combination of all added, copied, modified and renamed files (ACMR)*.           |
-|          any\_deleted           | string |                                               Returns `true` when any of <br>the filenames provided using the <br>`files` input has been deleted. <br>(D)                                                |
-|          any\_modified          | string | Returns `true` when any of <br>the filenames provided using the <br>`files` input has been modified. <br>i.e. *using a combination of all added, copied, modified, renamed, and deleted files (ACMRD)*.  |
-|          copied\_files          | string |                                                                               Returns only files that are <br>Copied (C).                                                                                |
-|         deleted\_files          | string |                                                                              Returns only files that are <br>Deleted (D).                                                                                |
-|         modified\_files         | string |                                                                              Returns only files that are <br>Modified (M).                                                                               |
-|          only\_changed          | string |                Returns `true` when only files <br>provided using the `files` input <br>has changed. i.e. *using a combination of all added, copied, modified and renamed files (ACMR)*.                  |
-|          only\_deleted          | string |                                                      Returns `true` when only files <br>provided using the `files` input <br>has been deleted. (D)                                                       |
-|         only\_modified          | string |                                                   Returns `true` when only files <br>provided using the `files` input <br>has been modified. (ACMRD).                                                    |
-|      other\_changed\_files       | string |                        Returns all other changed files <br>not listed in the files <br>input i.e. *using a combination of all added, copied, modified and renamed files (ACMR)*.                         |
-|      other\_deleted\_files       | string |                                          Returns all other deleted files <br>not listed in the files <br>input i.e. *a  combination of all deleted files (D)*                                            |
-|      other\_modified\_files      | string |                         Returns all other modified files <br>not listed in the files <br>input i.e. *a  combination of all added, copied, modified, and deleted files (ACMRD)*                           |
-|         renamed\_files          | string |                                                                              Returns only files that are <br>Renamed (R).                                                                                |
-|       type\_changed\_files       | string |                                                                      Returns only files that have <br>their file type changed (T).                                                                       |
-|         unknown\_files          | string |                                                                              Returns only files that are <br>Unknown (X).                                                                                |
-|         unmerged\_files         | string |                                                                              Returns only files that are <br>Unmerged (U).                                                                               |
+|             OUTPUT             |  TYPE  |                                                                                                          DESCRIPTION                                                                                                          |
+|--------------------------------|--------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|          added\_files           | string |                                                                                          Returns only files that are <br>Added (A).                                                                                           |
+| all\_changed\_and\_modified\_files | string |                                                                        Returns all changed and modified <br>files i.e. *a combination of (ACMRDTUX)*                                                                          |
+|       all\_changed\_files        | string |                                                          Returns all changed files i.e. <br>*a combination of all added, copied, modified and renamed files (ACMR)*                                                           |
+|       all\_modified\_files       | string |                                                    Returns all changed files i.e. <br>*a combination of all added, copied, modified, renamed and deleted files (ACMRD)*.                                                      |
+|   all\_old\_new\_renamed\_files    | string |                           Returns only files that are <br>Renamed and list their old <br>and new names. **NOTE:** This <br>requires setting `include_all_old_new_renamed_files` to `true` <br>(R)                             |
+|          any\_changed           | string |         Returns `true` when any of <br>the filenames provided using the <br>`files*` or `files_ignore*` inputs has changed. i.e. <br>*using a combination of all added, copied, modified and renamed files (ACMR)*.           |
+|          any\_deleted           | string |                                               Returns `true` when any of <br>the filenames provided using the <br>`files*` or `files_ignore*` inputs has been deleted. <br>(D)                                                |
+|          any\_modified          | string | Returns `true` when any of <br>the filenames provided using the <br>`files*` or `files_ignore*` inputs has been modified. <br>i.e. *using a combination of all added, copied, modified, renamed, and deleted files (ACMRD)*.  |
+|          copied\_files          | string |                                                                                         Returns only files that are <br>Copied (C).                                                                                           |
+|         deleted\_files          | string |                                                                                         Returns only files that are <br>Deleted (D).                                                                                          |
+|         modified\_files         | string |                                                                                        Returns only files that are <br>Modified (M).                                                                                          |
+|          only\_changed          | string |                Returns `true` when only files <br>provided using the `files*` or `files_ignore*` inputs <br>has changed. i.e. *using a combination of all added, copied, modified and renamed files (ACMR)*.                  |
+|          only\_deleted          | string |                                                      Returns `true` when only files <br>provided using the `files*` or `files_ignore*` inputs <br>has been deleted. (D)                                                       |
+|         only\_modified          | string |                                                   Returns `true` when only files <br>provided using the `files*` or `files_ignore*` inputs <br>has been modified. (ACMRD).                                                    |
+|      other\_changed\_files       | string |                                  Returns all other changed files <br>not listed in the files <br>input i.e. *using a combination of all added, copied, modified and renamed files (ACMR)*.                                    |
+|      other\_deleted\_files       | string |                                                     Returns all other deleted files <br>not listed in the files <br>input i.e. *a  combination of all deleted files (D)*                                                      |
+|      other\_modified\_files      | string |                                    Returns all other modified files <br>not listed in the files <br>input i.e. *a  combination of all added, copied, modified, and deleted files (ACMRD)*                                     |
+|         renamed\_files          | string |                                                                                         Returns only files that are <br>Renamed (R).                                                                                          |
+|       type\_changed\_files       | string |                                                                                Returns only files that have <br>their file type changed (T).                                                                                  |
+|         unknown\_files          | string |                                                                                         Returns only files that are <br>Unknown (X).                                                                                          |
+|         unmerged\_files         | string |                                                                                        Returns only files that are <br>Unmerged (U).                                                                                          |
 
 <!-- AUTO-DOC-OUTPUT:END -->
 
@@ -200,36 +202,37 @@ Support this project with a :star:
 
 <!-- AUTO-DOC-INPUT:START - Do not remove or modify this section -->
 
-|                  INPUT                  |  TYPE  | REQUIRED |       DEFAULT       |                                                                                                                    DESCRIPTION                                                                                                                    |
-|-----------------------------------------|--------|----------|---------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-|                base\_sha                 | string |  false   |                     |                                                                                        Specify a different base commit <br>SHA used for comparing changes                                                                                         |
-|              diff\_relative              | string |  false   |      `"true"`       |                            Exclude changes outside the current <br>directory and show path names <br>relative to it. **NOTE:** This <br>requires you to specify the <br>top level directory via the <br>`path` input.                             |
-|                dir\_names                | string |  false   |      `"false"`      |                                             Output unique changed directories instead <br>of filenames. **NOTE:** This returns <br>`.` for changed files located <br>in the root of the <br>project.                                              |
-|         dir\_names\_exclude\_root          | string |  false   |      `"false"`      |                                                                     Exclude the root directory represented <br>by `.` from the output <br>when `dir_names`is set to `true`.                                                                       |
-|           dir\_names\_max\_depth           | string |  false   |                     |                                                                Maximum depth of directories to <br>output. e.g `test/test1/test2` with max <br>depth of `2` returns `test/test1`.                                                                 |
-|               escape\_json               | string |  false   |      `"true"`       |                                                                                                                Escape JSON output.                                                                                                                |
-|               fetch\_depth               | string |  false   |       `"50"`        |                                                       Depth of additional branch history <br>fetched. **NOTE**: This can be <br>adjusted to resolve errors with <br>insufficient history.                                                         |
-|                  files                  | string |  false   |                     |                       File and directory patterns to <br>detect changes using only these <br>list of file(s) (Defaults to the entire repo) **NOTE:** <br>Multiline file/directory patterns should not <br>include quotes.                         |
-|         files\_from\_source\_file          | string |  false   |                     |                                                                                              Source file(s) used to populate <br>the `files` input.                                                                                               |
-|    files\_from\_source\_file\_separator     | string |  false   |       `"\n"`        |                                                                                          Separator used to split the <br>`files_from_source_file` input                                                                                           |
-|              files\_ignore               | string |  false   |                     |                                                                  Ignore changes to these file(s) <br>**NOTE:** Multiline file/directory patterns should <br>not include quotes.                                                                   |
-|      files\_ignore\_from\_source\_file      | string |  false   |                     |                                                                                           Source file(s) used to populate <br>the `files_ignore` input                                                                                            |
-| files\_ignore\_from\_source\_file\_separator | string |  false   |       `"\n"`        |                                                                                      Separator used to split the <br>`files_ignore_from_source_file` input                                                                                        |
-|         files\_ignore\_separator          | string |  false   |       `"\n"`        |                                                                                               Separator used to split the <br>`files_ignore` input                                                                                                |
-|             files\_separator             | string |  false   |       `"\n"`        |                                                                                                  Separator used to split the <br>`files` input                                                                                                    |
-|    include\_all\_old\_new\_renamed\_files    | string |  false   |      `"false"`      |                                          Include `all_old_new_renamed_files` output. Note this <br>can generate a large output <br>See: [#501](https://github.com/tj-actions/changed-files/issues/501).                                           |
-|                  json                   | string |  false   |      `"false"`      |                                                                      Output list of changed files <br>in a JSON formatted string <br>which can be used for <br>matrix jobs.                                                                       |
-|         old\_new\_files\_separator         | string |  false   |        `" "`        |                                                                                           Split character for old and <br>new renamed filename pairs.                                                                                             |
-|            old\_new\_separator            | string |  false   |        `","`        |                                                                                               Split character for old and <br>new filename pairs.                                                                                                 |
-|               output\_dir                | string |  false   | `".github/outputs"` |                                                                                                         Directory to store output files.                                                                                                          |
-|                  path                   | string |  false   |        `"."`        |                                                                                 Specify a relative path under <br>`$GITHUB_WORKSPACE` to locate the repository.                                                                                   |
-|                quotepath                | string |  false   |      `"true"`       |                                                           Use non ascii characters to <br>match files and output the <br>filenames completely verbatim by setting <br>this to `false`                                                             |
-|                separator                | string |  false   |        `" "`        |                                                                                                        Split character for output strings                                                                                                         |
-|                   sha                   | string |  false   |                     |                                                                                          Specify a different commit SHA <br>used for comparing changes                                                                                            |
-|                  since                  | string |  false   |                     |                                                                               Get changed files for commits <br>whose timestamp is older than <br>the given time.                                                                                 |
-|        since\_last\_remote\_commit         | string |  false   |      `"false"`      | Use the last commit on <br>the remote branch as the <br>`base_sha`. Defaults to the last <br>non merge commit on the <br>target branch for pull request <br>events and the previous remote <br>commit of the current branch <br>for push events.  |
-|                  until                  | string |  false   |                     |                                                                              Get changed files for commits <br>whose timestamp is earlier than <br>the given time.                                                                                |
-|           write\_output\_files            | string |  false   |      `"false"`      |                                                                                      Write outputs to files in <br>the `.github/outputs` folder by default.                                                                                       |
+|                                    INPUT                                     |  TYPE  | REQUIRED |       DEFAULT       |                                                                                                                    DESCRIPTION                                                                                                                    |
+|------------------------------------------------------------------------------|--------|----------|---------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|                                   base\_sha                                   | string |  false   |                     |                                                                                        Specify a different base commit <br>SHA used for comparing changes                                                                                         |
+|                                diff\_relative                                 | string |  false   |      `"true"`       |                            Exclude changes outside the current <br>directory and show path names <br>relative to it. **NOTE:** This <br>requires you to specify the <br>top level directory via the <br>`path` input.                             |
+|                                  dir\_names                                   | string |  false   |      `"false"`      |                       Output unique changed directories instead <br>of filenames. **NOTE:** This returns <br>`.` for changed files located <br>in the current working directory <br>which defaults to `$GITHUB_WORKSPACE`.                        |
+|                        dir\_names\_exclude\_current\_dir                         | string |  false   |      `"false"`      |                                                                 Exclude the current directory represented <br>by `.` from the output <br>when `dir_names` is set to <br>`true`.                                                                   |
+| ~~dir\_names\_exclude\_root~~ <br> Use `dir_names_exclude_current_dir` instead. | string |  false   |      `"false"`      |                                                           **Deprecated:** Exclude the root directory <br>represented by `.` from the <br>output when `dir_names`is set to <br>`true`.                                                             |
+|                             dir\_names\_max\_depth                              | string |  false   |                     |                                                           Limit the directory output to <br>a maximum depth e.g `test/test1/test2` <br>with max depth of `2` <br>returns `test/test1`.                                                            |
+|                                 escape\_json                                  | string |  false   |      `"true"`       |                                                                                                                Escape JSON output.                                                                                                                |
+|                                 fetch\_depth                                  | string |  false   |       `"50"`        |                                                       Depth of additional branch history <br>fetched. **NOTE**: This can be <br>adjusted to resolve errors with <br>insufficient history.                                                         |
+|                                    files                                     | string |  false   |                     |                       File and directory patterns to <br>detect changes using only these <br>list of file(s) (Defaults to the entire repo) **NOTE:** <br>Multiline file/directory patterns should not <br>include quotes.                         |
+|                            files\_from\_source\_file                            | string |  false   |                     |                                                                                              Source file(s) used to populate <br>the `files` input.                                                                                               |
+|                       files\_from\_source\_file\_separator                       | string |  false   |       `"\n"`        |                                                                                          Separator used to split the <br>`files_from_source_file` input                                                                                           |
+|                                 files\_ignore                                 | string |  false   |                     |                                                                  Ignore changes to these file(s) <br>**NOTE:** Multiline file/directory patterns should <br>not include quotes.                                                                   |
+|                        files\_ignore\_from\_source\_file                         | string |  false   |                     |                                                                                           Source file(s) used to populate <br>the `files_ignore` input                                                                                            |
+|                   files\_ignore\_from\_source\_file\_separator                    | string |  false   |       `"\n"`        |                                                                                      Separator used to split the <br>`files_ignore_from_source_file` input                                                                                        |
+|                            files\_ignore\_separator                            | string |  false   |       `"\n"`        |                                                                                               Separator used to split the <br>`files_ignore` input                                                                                                |
+|                               files\_separator                                | string |  false   |       `"\n"`        |                                                                                                  Separator used to split the <br>`files` input                                                                                                    |
+|                      include\_all\_old\_new\_renamed\_files                       | string |  false   |      `"false"`      |                                          Include `all_old_new_renamed_files` output. Note this <br>can generate a large output <br>See: [#501](https://github.com/tj-actions/changed-files/issues/501).                                           |
+|                                     json                                     | string |  false   |      `"false"`      |                                                                      Output list of changed files <br>in a JSON formatted string <br>which can be used for <br>matrix jobs.                                                                       |
+|                           old\_new\_files\_separator                            | string |  false   |        `" "`        |                                                                                           Split character for old and <br>new renamed filename pairs.                                                                                             |
+|                              old\_new\_separator                               | string |  false   |        `","`        |                                                                                               Split character for old and <br>new filename pairs.                                                                                                 |
+|                                  output\_dir                                  | string |  false   | `".github/outputs"` |                                                                                                         Directory to store output files.                                                                                                          |
+|                                     path                                     | string |  false   |        `"."`        |                                                                                 Specify a relative path under <br>`$GITHUB_WORKSPACE` to locate the repository.                                                                                   |
+|                                  quotepath                                   | string |  false   |      `"true"`       |                                                           Use non ascii characters to <br>match files and output the <br>filenames completely verbatim by setting <br>this to `false`                                                             |
+|                                  separator                                   | string |  false   |        `" "`        |                                                                                                        Split character for output strings                                                                                                         |
+|                                     sha                                      | string |  false   |                     |                                                                                          Specify a different commit SHA <br>used for comparing changes                                                                                            |
+|                                    since                                     | string |  false   |                     |                                                                               Get changed files for commits <br>whose timestamp is older than <br>the given time.                                                                                 |
+|                           since\_last\_remote\_commit                           | string |  false   |      `"false"`      | Use the last commit on <br>the remote branch as the <br>`base_sha`. Defaults to the last <br>non merge commit on the <br>target branch for pull request <br>events and the previous remote <br>commit of the current branch <br>for push events.  |
+|                                    until                                     | string |  false   |                     |                                                                              Get changed files for commits <br>whose timestamp is earlier than <br>the given time.                                                                                |
+|                              write\_output\_files                              | string |  false   |      `"false"`      |                            Write outputs to the `output_dir` <br>defaults to `.github/outputs` folder. **NOTE:** <br>This creates a `.txt` file <br>by default and a `.json` <br>file if `json` is set <br>to `true`.                             |
 
 <!-- AUTO-DOC-INPUT:END -->
 
@@ -735,6 +738,8 @@ See [inputs](#inputs) for more information.
 
 *   [aws-doc-sdk-examples: uses tj-actions/changed-files to automate testing](https://github.com/awsdocs/aws-doc-sdk-examples/blob/2393723ef6b0cad9502f4852f5c72f7be58ca89d/.github/workflows/javascript.yml#L22)
 
+![image](https://github.com/tj-actions/changed-files/assets/17484350/23767413-4c51-42fb-ab1c-39ef72c44904)
+
 And many more...
 
 ## Known Limitation

action.yml

@@ -79,15 +79,20 @@ inputs:
     default: "true"
   dir_names:
     default: "false"
-    description: "Output unique changed directories instead of filenames. **NOTE:** This returns `.` for changed files located in the root of the project."
+    description: "Output unique changed directories instead of filenames. **NOTE:** This returns `.` for changed files located in the current working directory which defaults to `$GITHUB_WORKSPACE`."
     required: false
   dir_names_max_depth:
-    description: "Maximum depth of directories to output. e.g `test/test1/test2` with max depth of `2` returns `test/test1`."
+    description: "Limit the directory output to a maximum depth e.g `test/test1/test2` with max depth of `2` returns `test/test1`."
     required: false
+  dir_names_exclude_current_dir:
+    description: "Exclude the current directory represented by `.` from the output when `dir_names` is set to `true`."
+    required: false
+    default: "false"
   dir_names_exclude_root:
     description: "Exclude the root directory represented by `.` from the output when `dir_names`is set to `true`."
     required: false
     default: "false"
+    deprecationMessage: "Use `dir_names_exclude_current_dir` instead."
   json:
     description: "Output list of changed files in a JSON formatted string which can be used for matrix jobs."
     required: false
@@ -105,7 +110,7 @@ inputs:
     required: false
     default: "false"
   write_output_files:
-    description: "Write outputs to files in the `.github/outputs` folder by default."
+    description: "Write outputs to the `output_dir` defaults to `.github/outputs` folder. **NOTE:** This creates a `.txt` file by default and a `.json` file if `json` is set to `true`."
     required: false
     default: "false"
   output_dir:
@@ -137,23 +142,23 @@ outputs:
   all_changed_files:
     description: "Returns all changed files i.e. *a combination of all added, copied, modified and renamed files (ACMR)*"
   any_changed:
-    description: "Returns `true` when any of the filenames provided using the `files` input has changed. i.e. *using a combination of all added, copied, modified and renamed files (ACMR)*."
+    description: "Returns `true` when any of the filenames provided using the `files*` or `files_ignore*` inputs has changed. i.e. *using a combination of all added, copied, modified and renamed files (ACMR)*."
   only_changed:
-    description: "Returns `true` when only files provided using the `files` input has changed. i.e. *using a combination of all added, copied, modified and renamed files (ACMR)*."
+    description: "Returns `true` when only files provided using the `files*` or `files_ignore*` inputs has changed. i.e. *using a combination of all added, copied, modified and renamed files (ACMR)*."
   other_changed_files:
     description: "Returns all other changed files not listed in the files input i.e. *using a combination of all added, copied, modified and renamed files (ACMR)*."
   all_modified_files:
     description: "Returns all changed files i.e. *a combination of all added, copied, modified, renamed and deleted files (ACMRD)*."
   any_modified:
-    description: "Returns `true` when any of the filenames provided using the `files` input has been modified. i.e. *using a combination of all added, copied, modified, renamed, and deleted files (ACMRD)*."
+    description: "Returns `true` when any of the filenames provided using the `files*` or `files_ignore*` inputs has been modified. i.e. *using a combination of all added, copied, modified, renamed, and deleted files (ACMRD)*."
   only_modified:
-    description: "Returns `true` when only files provided using the `files` input has been modified. (ACMRD)."
+    description: "Returns `true` when only files provided using the `files*` or `files_ignore*` inputs has been modified. (ACMRD)."
   other_modified_files:
     description: "Returns all other modified files not listed in the files input i.e. *a  combination of all added, copied, modified, and deleted files (ACMRD)*"
   any_deleted:
-    description: "Returns `true` when any of the filenames provided using the `files` input has been deleted. (D)"
+    description: "Returns `true` when any of the filenames provided using the `files*` or `files_ignore*` inputs has been deleted. (D)"
   only_deleted:
-    description: "Returns `true` when only files provided using the `files` input has been deleted. (D)"
+    description: "Returns `true` when only files provided using the `files*` or `files_ignore*` inputs has been deleted. (D)"
   other_deleted_files:
     description: "Returns all other deleted files not listed in the files input i.e. *a  combination of all deleted files (D)*"
 

dist/licenses.txt

@@ -134,6 +134,57 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
+lodash
+MIT
+Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
+
+Based on Underscore.js, copyright Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+This software consists of voluntary contributions made by many
+individuals. For exact contribution history, see the revision history
+available at https://github.com/lodash/lodash
+
+The following license applies to all parts of this software except as
+documented below:
+
+====
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+====
+
+Copyright and related rights for sample code are waived via CC0. Sample
+code is defined as all source code displayed within the prose of the
+documentation.
+
+CC0: http://creativecommons.org/publicdomain/zero/1.0/
+
+====
+
+Files located in the node_modules and vendor directories are externally
+maintained libraries used by this software which have their own
+licenses; we recommend you read them, as their terms may differ from the
+terms above.
+
+
 micromatch
 MIT
 The MIT License (MIT)

package.json

@@ -34,23 +34,25 @@
   "dependencies": {
     "@actions/core": "1.10.0",
     "@actions/exec": "1.1.1",
+    "lodash": "^4.17.15",
     "micromatch": "^4.0.5"
   },
   "devDependencies": {
     "@types/jest": "29.5.2",
+    "@types/lodash": "^4.14.195",
     "@types/micromatch": "^4.0.2",
     "@types/node": "20.2.1",
-    "@types/uuid": "9.0.1",
-    "@typescript-eslint/eslint-plugin": "5.59.8",
-    "@typescript-eslint/parser": "5.59.8",
+    "@types/uuid": "9.0.2",
+    "@typescript-eslint/eslint-plugin": "5.59.11",
+    "@typescript-eslint/parser": "5.59.11",
     "@vercel/ncc": "0.36.1",
-    "eslint": "8.41.0",
-    "eslint-plugin-github": "4.7.0",
+    "eslint": "8.42.0",
+    "eslint-plugin-github": "4.8.0",
     "eslint-plugin-jest": "27.2.1",
     "eslint-plugin-prettier": "^4.2.1",
     "jest": "29.5.0",
     "prettier": "2.8.8",
     "ts-jest": "29.1.0",
-    "typescript": "5.0.4"
+    "typescript": "5.1.3"
   }
 }

src/changedFiles.ts

@@ -4,11 +4,12 @@ import {DiffResult} from './commitSha'
 import {Inputs} from './inputs'
 import {
   getDirnameMaxDepth,
-  gitDiff,
   gitRenamedFiles,
   gitSubmoduleDiffSHA,
-  jsonOutput
+  jsonOutput,
+  getAllChangedFiles
 } from './utils'
+import flatten from 'lodash/flatten'
 
 export const getRenamedFiles = async ({
   inputs,
@@ -68,30 +69,37 @@ export const getRenamedFiles = async ({
   return renamedFiles.join(inputs.oldNewFilesSeparator)
 }
 
-export const getDiffFiles = async ({
-  inputs,
+export enum ChangeTypeEnum {
+  Added = 'A',
+  Copied = 'C',
+  Deleted = 'D',
+  Modified = 'M',
+  Renamed = 'R',
+  TypeChanged = 'T',
+  Unmerged = 'U',
+  Unknown = 'X'
+}
+
+export type ChangedFiles = {
+  [key in ChangeTypeEnum]: string[]
+}
+
+export const getAllDiffFiles = async ({
   workingDirectory,
   hasSubmodule,
   diffResult,
-  diffFilter,
-  filePatterns = [],
   submodulePaths
 }: {
-  inputs: Inputs
   workingDirectory: string
   hasSubmodule: boolean
   diffResult: DiffResult
-  diffFilter: string
-  filePatterns?: string[]
   submodulePaths: string[]
-}): Promise<string> => {
-  let files = await gitDiff({
+}): Promise<ChangedFiles> => {
+  const files = await getAllChangedFiles({
     cwd: workingDirectory,
     sha1: diffResult.previousSha,
     sha2: diffResult.currentSha,
-    diff: diffResult.diff,
-    diffFilter,
-    filePatterns
+    diff: diffResult.diff
   })
 
   if (hasSubmodule) {
@@ -110,31 +118,107 @@ export const getDiffFiles = async ({
       )
 
       if (submoduleShaResult.currentSha && submoduleShaResult.previousSha) {
-        const submoduleFiles = await gitDiff({
+        const submoduleFiles = await getAllChangedFiles({
           cwd: submoduleWorkingDirectory,
           sha1: submoduleShaResult.previousSha,
           sha2: submoduleShaResult.currentSha,
           diff: diffResult.diff,
-          diffFilter,
           isSubmodule: true,
-          filePatterns,
           parentDir: submodulePath
         })
-        files.push(...submoduleFiles)
+
+        for (const changeType of Object.keys(
+          submoduleFiles
+        ) as ChangeTypeEnum[]) {
+          if (!files[changeType]) {
+            files[changeType] = []
+          }
+          files[changeType].push(...submoduleFiles[changeType])
+        }
       }
     }
   }
 
-  if (inputs.dirNames) {
-    files = files.map(file =>
-      getDirnameMaxDepth({
-        pathStr: file,
-        dirNamesMaxDepth: inputs.dirNamesMaxDepth,
-        excludeRoot: inputs.dirNamesExcludeRoot
-      })
-    )
-    files = [...new Set(files)]
+  return files
+}
+
+function* getChangeTypeFilesGenerator({
+  inputs,
+  changedFiles,
+  changeTypes
+}: {
+  inputs: Inputs
+  changedFiles: ChangedFiles
+  changeTypes: ChangeTypeEnum[]
+}): Generator<string> {
+  for (const changeType of changeTypes) {
+    const files = changedFiles[changeType] || []
+    for (const file of files) {
+      if (inputs.dirNames) {
+        yield getDirnameMaxDepth({
+          pathStr: file,
+          dirNamesMaxDepth: inputs.dirNamesMaxDepth,
+          excludeCurrentDir:
+            inputs.dirNamesExcludeRoot || inputs.dirNamesExcludeCurrentDir
+        })
+      } else {
+        yield file
+      }
+    }
   }
+}
+
+export const getChangeTypeFiles = async ({
+  inputs,
+  changedFiles,
+  changeTypes
+}: {
+  inputs: Inputs
+  changedFiles: ChangedFiles
+  changeTypes: ChangeTypeEnum[]
+}): Promise<string> => {
+  const files = [
+    ...new Set(getChangeTypeFilesGenerator({inputs, changedFiles, changeTypes}))
+  ]
+
+  if (inputs.json) {
+    return jsonOutput({value: files, shouldEscape: inputs.escapeJson})
+  }
+
+  return files.join(inputs.separator)
+}
+
+function* getAllChangeTypeFilesGenerator({
+  inputs,
+  changedFiles
+}: {
+  inputs: Inputs
+  changedFiles: ChangedFiles
+}): Generator<string> {
+  for (const file of flatten(Object.values(changedFiles))) {
+    if (inputs.dirNames) {
+      yield getDirnameMaxDepth({
+        pathStr: file,
+        dirNamesMaxDepth: inputs.dirNamesMaxDepth,
+        excludeCurrentDir:
+          inputs.dirNamesExcludeRoot || inputs.dirNamesExcludeCurrentDir
+      })
+    } else {
+      yield file
+    }
+  }
+}
+
+export const getAllChangeTypeFiles = async ({
+  inputs,
+  changedFiles
+}: {
+  inputs: Inputs
+  changedFiles: ChangedFiles
+}): Promise<string> => {
+  const files = [
+    ...new Set(getAllChangeTypeFilesGenerator({inputs, changedFiles}))
+  ]
 
   if (inputs.json) {
     return jsonOutput({value: files, shouldEscape: inputs.escapeJson})

src/commitSha.ts

@@ -15,9 +15,11 @@ import {
 } from './utils'
 
 const getCurrentSHA = async ({
+  env,
   inputs,
   workingDirectory
 }: {
+  env: Env
   inputs: Inputs
   workingDirectory: string
 }): Promise<string> => {
@@ -47,7 +49,18 @@ const getCurrentSHA = async ({
     }
   } else {
     if (!currentSha) {
-      currentSha = await getHeadSha({cwd: workingDirectory})
+      if (
+        env.GITHUB_EVENT_PULL_REQUEST_HEAD_SHA &&
+        (await verifyCommitSha({
+          sha: env.GITHUB_EVENT_PULL_REQUEST_HEAD_SHA,
+          cwd: workingDirectory,
+          showAsErrorMessage: false
+        })) === 0
+      ) {
+        currentSha = env.GITHUB_EVENT_PULL_REQUEST_HEAD_SHA
+      } else {
+        currentSha = await getHeadSha({cwd: workingDirectory})
+      }
     }
   }
 
@@ -124,7 +137,7 @@ export const getSHAForPushEvent = async (
     }
   }
 
-  const currentSha = await getCurrentSHA({inputs, workingDirectory})
+  const currentSha = await getCurrentSHA({env, inputs, workingDirectory})
   let previousSha = inputs.baseSha
   const diff = '..'
 
@@ -321,7 +334,7 @@ export const getSHAForPullRequestEvent = async (
     core.info('Completed fetching more history.')
   }
 
-  const currentSha = await getCurrentSHA({inputs, workingDirectory})
+  const currentSha = await getCurrentSHA({env, inputs, workingDirectory})
   let previousSha = inputs.baseSha
   let diff = '...'
 
@@ -336,7 +349,7 @@ export const getSHAForPullRequestEvent = async (
       throw new Error('Similar commit hashes detected.')
     }
 
-    await verifyCommitSha({sha: currentSha, cwd: workingDirectory})
+    await verifyCommitSha({sha: previousSha, cwd: workingDirectory})
     core.debug(`Previous SHA: ${previousSha}`)
 
     return {
@@ -357,13 +370,22 @@ export const getSHAForPullRequestEvent = async (
 
   if (!previousSha) {
     if (inputs.sinceLastRemoteCommit) {
-      previousSha = env.GITHUB_EVENT_BEFORE
+      previousSha =
+        env.GITHUB_EVENT_BEFORE ||
+        (await getRemoteBranchHeadSha({
+          cwd: workingDirectory,
+          branch: currentBranch
+        }))
 
-      if (!previousSha) {
-        previousSha = await getParentSha({cwd: workingDirectory})
-      }
-
-      if (!previousSha) {
+      if (
+        !previousSha ||
+        (previousSha &&
+          (await verifyCommitSha({sha: previousSha, cwd: workingDirectory})) !==
+            0)
+      ) {
+        core.warning(
+          'Unable to locate the remote branch head sha. Falling back to the pull request base sha.'
+        )
         previousSha = env.GITHUB_EVENT_PULL_REQUEST_BASE_SHA
       }
     } else {
@@ -458,9 +480,28 @@ export const getSHAForPullRequestEvent = async (
     core.error(
       `Similar commit hashes detected: previous sha: ${previousSha} is equivalent to the current sha: ${currentSha}.`
     )
-    core.error(
-      `Please verify that both commits are valid, and increase the fetch_depth to a number higher than ${inputs.fetchDepth}.`
-    )
+    // This occurs if a PR is created from a forked repository and the event is pull_request_target.
+    //  - name: Checkout to branch
+    //    uses: actions/checkout@v3
+    // Without setting the repository to use the same repository as the pull request will cause the previousSha
+    // to be the same as the currentSha since the currentSha cannot be found in the local history.
+    // The solution is to use:
+    //   - name: Checkout to branch
+    //     uses: actions/checkout@v3
+    //     with:
+    //       repository: ${{ github.event.pull_request.head.repo.full_name }}
+    if (env.GITHUB_EVENT_NAME === 'pull_request_target') {
+      core.warning(
+        'If this pull request is from a forked repository, please set the checkout action `repository` input to the same repository as the pull request.'
+      )
+      core.warning(
+        'This can be done by setting actions/checkout `repository` to ${{ github.event.pull_request.head.repo.full_name }}'
+      )
+    } else {
+      core.error(
+        `Please verify that both commits are valid, and increase the fetch_depth to a number higher than ${inputs.fetchDepth}.`
+      )
+    }
     throw new Error('Similar commit hashes detected.')
   }
 

src/env.ts

@@ -14,6 +14,8 @@ export type Env = {
   GITHUB_EVENT_FORCED: string
   GITHUB_EVENT_PULL_REQUEST_NUMBER: string
   GITHUB_EVENT_PULL_REQUEST_BASE_SHA: string
+  GITHUB_EVENT_PULL_REQUEST_HEAD_SHA: string
+  GITHUB_EVENT_NAME: string
 }
 
 type GithubEvent = {
@@ -21,6 +23,7 @@ type GithubEvent = {
   pull_request?: {
     head: {
       ref: string
+      sha: string
     }
     base: {
       ref: string
@@ -33,8 +36,10 @@ type GithubEvent = {
   }
   before?: string
   base_ref?: string
-  head_repo?: {
-    fork: string
+  head?: {
+    repo?: {
+      fork: string
+    }
   }
 }
 
@@ -55,12 +60,14 @@ export const getEnv = async (): Promise<Env> => {
     GITHUB_EVENT_BASE_REF: eventJson.base_ref || '',
     GITHUB_EVENT_RELEASE_TARGET_COMMITISH:
       eventJson.release?.target_commitish || '',
-    GITHUB_EVENT_HEAD_REPO_FORK: eventJson.head_repo?.fork || '',
+    GITHUB_EVENT_HEAD_REPO_FORK: eventJson.head?.repo?.fork || '',
     GITHUB_EVENT_PULL_REQUEST_NUMBER: eventJson.pull_request?.number || '',
     GITHUB_EVENT_PULL_REQUEST_BASE_SHA: eventJson.pull_request?.base?.sha || '',
+    GITHUB_EVENT_PULL_REQUEST_HEAD_SHA: eventJson.pull_request?.head?.sha || '',
     GITHUB_EVENT_FORCED: eventJson.forced || '',
     GITHUB_REF_NAME: process.env.GITHUB_REF_NAME || '',
     GITHUB_REF: process.env.GITHUB_REF || '',
-    GITHUB_WORKSPACE: process.env.GITHUB_WORKSPACE || ''
+    GITHUB_WORKSPACE: process.env.GITHUB_WORKSPACE || '',
+    GITHUB_EVENT_NAME: process.env.GITHUB_EVENT_NAME || ''
   }
 }

src/inputs.ts

@@ -23,6 +23,7 @@ export type Inputs = {
   dirNames: boolean
   dirNamesMaxDepth?: number
   dirNamesExcludeRoot: boolean
+  dirNamesExcludeCurrentDir: boolean
   json: boolean
   escapeJson: boolean
   fetchDepth?: number
@@ -93,6 +94,12 @@ export const getInputs = (): Inputs => {
   const dirNamesExcludeRoot = core.getBooleanInput('dir_names_exclude_root', {
     required: false
   })
+  const dirNamesExcludeCurrentDir = core.getBooleanInput(
+    'dir_names_exclude_current_dir',
+    {
+      required: false
+    }
+  )
   const json = core.getBooleanInput('json', {required: false})
   const escapeJson = core.getBooleanInput('escape_json', {required: false})
   const fetchDepth = core.getInput('fetch_depth', {required: false})
@@ -127,6 +134,7 @@ export const getInputs = (): Inputs => {
     diffRelative,
     dirNames,
     dirNamesExcludeRoot,
+    dirNamesExcludeCurrentDir,
     json,
     escapeJson,
     sinceLastRemoteCommit,

src/main.ts

@@ -1,15 +1,22 @@
 import * as core from '@actions/core'
 import path from 'path'
-import {getDiffFiles, getRenamedFiles} from './changedFiles'
 import {
+  getAllChangeTypeFiles,
+  getAllDiffFiles,
+  getChangeTypeFiles,
+  getRenamedFiles,
+  ChangeTypeEnum
+} from './changedFiles'
+import {
+  DiffResult,
   getSHAForPullRequestEvent,
-  getSHAForPushEvent,
-  DiffResult
+  getSHAForPushEvent
 } from './commitSha'
 import {getEnv} from './env'
 import {getInputs} from './inputs'
 import {
   getFilePatterns,
+  getFilteredChangedFiles,
   getSubmodulePath,
   isRepoShallow,
   setOutput,
@@ -67,7 +74,7 @@ export async function run(): Promise<void> {
   let diffResult: DiffResult
 
   if (!env.GITHUB_EVENT_PULL_REQUEST_BASE_REF) {
-    core.info('Running on a push event...')
+    core.info(`Running on a ${env.GITHUB_EVENT_NAME || 'push'} event...`)
     diffResult = await getSHAForPushEvent(
       inputs,
       env,
@@ -78,7 +85,9 @@ export async function run(): Promise<void> {
       isTag
     )
   } else {
-    core.info('Running on a pull request event...')
+    core.info(
+      `Running on a ${env.GITHUB_EVENT_NAME || 'pull_request'} event...`
+    )
     diffResult = await getSHAForPullRequestEvent(
       inputs,
       env,
@@ -103,16 +112,27 @@ export async function run(): Promise<void> {
     inputs,
     workingDirectory
   })
+  core.debug(`File patterns: ${filePatterns}`)
 
-  const addedFiles = await getDiffFiles({
-    inputs,
+  const allDiffFiles = await getAllDiffFiles({
     workingDirectory,
     hasSubmodule,
     diffResult,
-    diffFilter: 'A',
-    filePatterns,
     submodulePaths
   })
+  core.debug(`All diff files: ${JSON.stringify(allDiffFiles)}`)
+
+  const allFilteredDiffFiles = await getFilteredChangedFiles({
+    allDiffFiles,
+    filePatterns
+  })
+  core.debug(`All filtered diff files: ${JSON.stringify(allFilteredDiffFiles)}`)
+
+  const addedFiles = await getChangeTypeFiles({
+    inputs,
+    changedFiles: allFilteredDiffFiles,
+    changeTypes: [ChangeTypeEnum.Added]
+  })
   core.debug(`Added files: ${addedFiles}`)
   await setOutput({
     key: 'added_files',
@@ -120,14 +140,10 @@ export async function run(): Promise<void> {
     inputs
   })
 
-  const copiedFiles = await getDiffFiles({
+  const copiedFiles = await getChangeTypeFiles({
     inputs,
-    workingDirectory,
-    hasSubmodule,
-    diffResult,
-    diffFilter: 'C',
-    filePatterns,
-    submodulePaths
+    changedFiles: allFilteredDiffFiles,
+    changeTypes: [ChangeTypeEnum.Copied]
   })
   core.debug(`Copied files: ${copiedFiles}`)
   await setOutput({
@@ -136,14 +152,10 @@ export async function run(): Promise<void> {
     inputs
   })
 
-  const modifiedFiles = await getDiffFiles({
+  const modifiedFiles = await getChangeTypeFiles({
     inputs,
-    workingDirectory,
-    hasSubmodule,
-    diffResult,
-    diffFilter: 'M',
-    filePatterns,
-    submodulePaths
+    changedFiles: allFilteredDiffFiles,
+    changeTypes: [ChangeTypeEnum.Modified]
   })
   core.debug(`Modified files: ${modifiedFiles}`)
   await setOutput({
@@ -152,14 +164,10 @@ export async function run(): Promise<void> {
     inputs
   })
 
-  const renamedFiles = await getDiffFiles({
+  const renamedFiles = await getChangeTypeFiles({
     inputs,
-    workingDirectory,
-    hasSubmodule,
-    diffResult,
-    diffFilter: 'R',
-    filePatterns,
-    submodulePaths
+    changedFiles: allFilteredDiffFiles,
+    changeTypes: [ChangeTypeEnum.Renamed]
   })
   core.debug(`Renamed files: ${renamedFiles}`)
   await setOutput({
@@ -168,14 +176,10 @@ export async function run(): Promise<void> {
     inputs
   })
 
-  const typeChangedFiles = await getDiffFiles({
+  const typeChangedFiles = await getChangeTypeFiles({
     inputs,
-    workingDirectory,
-    hasSubmodule,
-    diffResult,
-    diffFilter: 'T',
-    filePatterns,
-    submodulePaths
+    changedFiles: allFilteredDiffFiles,
+    changeTypes: [ChangeTypeEnum.TypeChanged]
   })
   core.debug(`Type changed files: ${typeChangedFiles}`)
   await setOutput({
@@ -184,14 +188,10 @@ export async function run(): Promise<void> {
     inputs
   })
 
-  const unmergedFiles = await getDiffFiles({
+  const unmergedFiles = await getChangeTypeFiles({
     inputs,
-    workingDirectory,
-    hasSubmodule,
-    diffResult,
-    diffFilter: 'U',
-    filePatterns,
-    submodulePaths
+    changedFiles: allFilteredDiffFiles,
+    changeTypes: [ChangeTypeEnum.Unmerged]
   })
   core.debug(`Unmerged files: ${unmergedFiles}`)
   await setOutput({
@@ -200,14 +200,10 @@ export async function run(): Promise<void> {
     inputs
   })
 
-  const unknownFiles = await getDiffFiles({
+  const unknownFiles = await getChangeTypeFiles({
     inputs,
-    workingDirectory,
-    hasSubmodule,
-    diffResult,
-    diffFilter: 'X',
-    filePatterns,
-    submodulePaths
+    changedFiles: allFilteredDiffFiles,
+    changeTypes: [ChangeTypeEnum.Unknown]
   })
   core.debug(`Unknown files: ${unknownFiles}`)
   await setOutput({
@@ -216,14 +212,9 @@ export async function run(): Promise<void> {
     inputs
   })
 
-  const allChangedAndModifiedFiles = await getDiffFiles({
+  const allChangedAndModifiedFiles = await getAllChangeTypeFiles({
     inputs,
-    workingDirectory,
-    hasSubmodule,
-    diffResult,
-    diffFilter: 'ACDMRTUX',
-    filePatterns,
-    submodulePaths
+    changedFiles: allFilteredDiffFiles
   })
   core.debug(`All changed and modified files: ${allChangedAndModifiedFiles}`)
   await setOutput({
@@ -232,14 +223,15 @@ export async function run(): Promise<void> {
     inputs
   })
 
-  const allChangedFiles = await getDiffFiles({
+  const allChangedFiles = await getChangeTypeFiles({
     inputs,
-    workingDirectory,
-    hasSubmodule,
-    diffResult,
-    diffFilter: 'ACMR',
-    filePatterns,
-    submodulePaths
+    changedFiles: allFilteredDiffFiles,
+    changeTypes: [
+      ChangeTypeEnum.Added,
+      ChangeTypeEnum.Copied,
+      ChangeTypeEnum.Modified,
+      ChangeTypeEnum.Renamed
+    ]
   })
   core.debug(`All changed files: ${allChangedFiles}`)
   await setOutput({
@@ -254,13 +246,15 @@ export async function run(): Promise<void> {
     inputs
   })
 
-  const allOtherChangedFiles = await getDiffFiles({
+  const allOtherChangedFiles = await getChangeTypeFiles({
     inputs,
-    workingDirectory,
-    hasSubmodule,
-    diffResult,
-    diffFilter: 'ACMR',
-    submodulePaths
+    changedFiles: allDiffFiles,
+    changeTypes: [
+      ChangeTypeEnum.Added,
+      ChangeTypeEnum.Copied,
+      ChangeTypeEnum.Modified,
+      ChangeTypeEnum.Renamed
+    ]
   })
   core.debug(`All other changed files: ${allOtherChangedFiles}`)
 
@@ -271,7 +265,9 @@ export async function run(): Promise<void> {
     )
 
   const onlyChanged =
-    otherChangedFiles.length === 0 && allChangedFiles.length > 0
+    otherChangedFiles.length === 0 &&
+    allChangedFiles.length > 0 &&
+    filePatterns.length > 0
 
   await setOutput({
     key: 'only_changed',
@@ -285,14 +281,16 @@ export async function run(): Promise<void> {
     inputs
   })
 
-  const allModifiedFiles = await getDiffFiles({
+  const allModifiedFiles = await getChangeTypeFiles({
     inputs,
-    workingDirectory,
-    hasSubmodule,
-    diffResult,
-    diffFilter: 'ACMRD',
-    filePatterns,
-    submodulePaths
+    changedFiles: allFilteredDiffFiles,
+    changeTypes: [
+      ChangeTypeEnum.Added,
+      ChangeTypeEnum.Copied,
+      ChangeTypeEnum.Modified,
+      ChangeTypeEnum.Renamed,
+      ChangeTypeEnum.Deleted
+    ]
   })
   core.debug(`All modified files: ${allModifiedFiles}`)
   await setOutput({
@@ -307,13 +305,16 @@ export async function run(): Promise<void> {
     inputs
   })
 
-  const allOtherModifiedFiles = await getDiffFiles({
+  const allOtherModifiedFiles = await getChangeTypeFiles({
     inputs,
-    workingDirectory,
-    hasSubmodule,
-    diffResult,
-    diffFilter: 'ACMRD',
-    submodulePaths
+    changedFiles: allDiffFiles,
+    changeTypes: [
+      ChangeTypeEnum.Added,
+      ChangeTypeEnum.Copied,
+      ChangeTypeEnum.Modified,
+      ChangeTypeEnum.Renamed,
+      ChangeTypeEnum.Deleted
+    ]
   })
 
   const otherModifiedFiles = allOtherModifiedFiles
@@ -323,7 +324,9 @@ export async function run(): Promise<void> {
     )
 
   const onlyModified =
-    otherModifiedFiles.length === 0 && allModifiedFiles.length > 0
+    otherModifiedFiles.length === 0 &&
+    allModifiedFiles.length > 0 &&
+    filePatterns.length > 0
 
   await setOutput({
     key: 'only_modified',
@@ -337,14 +340,10 @@ export async function run(): Promise<void> {
     inputs
   })
 
-  const deletedFiles = await getDiffFiles({
+  const deletedFiles = await getChangeTypeFiles({
     inputs,
-    workingDirectory,
-    hasSubmodule,
-    diffResult,
-    diffFilter: 'D',
-    filePatterns,
-    submodulePaths
+    changedFiles: allFilteredDiffFiles,
+    changeTypes: [ChangeTypeEnum.Deleted]
   })
   core.debug(`Deleted files: ${deletedFiles}`)
   await setOutput({
@@ -359,13 +358,10 @@ export async function run(): Promise<void> {
     inputs
   })
 
-  const allOtherDeletedFiles = await getDiffFiles({
+  const allOtherDeletedFiles = await getChangeTypeFiles({
     inputs,
-    workingDirectory,
-    hasSubmodule,
-    diffResult,
-    diffFilter: 'D',
-    submodulePaths
+    changedFiles: allDiffFiles,
+    changeTypes: [ChangeTypeEnum.Deleted]
   })
 
   const otherDeletedFiles = allOtherDeletedFiles
@@ -374,7 +370,10 @@ export async function run(): Promise<void> {
       filePath => !deletedFiles.split(inputs.separator).includes(filePath)
     )
 
-  const onlyDeleted = otherDeletedFiles.length === 0 && deletedFiles.length > 0
+  const onlyDeleted =
+    otherDeletedFiles.length === 0 &&
+    deletedFiles.length > 0 &&
+    filePatterns.length > 0
 
   await setOutput({
     key: 'only_deleted',

src/utils.ts

@@ -5,6 +5,7 @@ import {createReadStream, promises as fs} from 'fs'
 import mm from 'micromatch'
 import * as path from 'path'
 import {createInterface} from 'readline'
+import {ChangedFiles, ChangeTypeEnum} from './changedFiles'
 
 import {Inputs} from './inputs'
 
@@ -288,7 +289,7 @@ export const getSubmodulePath = async ({
   return stdout
     .trim()
     .split('\n')
-    .map(line => normalizePath(line.split(' ')[1]))
+    .map((line: string) => normalizePath(line.split(' ')[1]))
 }
 
 export const gitSubmoduleDiffSHA = async ({
@@ -389,7 +390,7 @@ export const gitRenamedFiles = async ({
     .trim()
     .split('\n')
     .filter(Boolean)
-    .map(line => {
+    .map((line: string) => {
       core.debug(`Renamed file: ${line}`)
       const [, oldPath, newPath] = line.split('\t')
       if (isSubmodule) {
@@ -403,32 +404,28 @@ export const gitRenamedFiles = async ({
     })
 }
 
-export const gitDiff = async ({
+export const getAllChangedFiles = async ({
   cwd,
   sha1,
   sha2,
   diff,
-  diffFilter,
-  filePatterns = [],
   isSubmodule = false,
   parentDir = ''
 }: {
   cwd: string
   sha1: string
   sha2: string
-  diffFilter: string
   diff: string
-  filePatterns?: string[]
   isSubmodule?: boolean
   parentDir?: string
-}): Promise<string[]> => {
+}): Promise<ChangedFiles> => {
   const {exitCode, stdout, stderr} = await exec.getExecOutput(
     'git',
     [
       'diff',
-      '--name-only',
+      '--name-status',
       '--ignore-submodules=all',
-      `--diff-filter=${diffFilter}`,
+      `--diff-filter=ACDMRTUX`,
       `${sha1}${diff}${sha2}`
     ],
     {
@@ -437,6 +434,16 @@ export const gitDiff = async ({
       silent: process.env.RUNNER_DEBUG !== '1'
     }
   )
+  const changedFiles: ChangedFiles = {
+    [ChangeTypeEnum.Added]: [],
+    [ChangeTypeEnum.Copied]: [],
+    [ChangeTypeEnum.Deleted]: [],
+    [ChangeTypeEnum.Modified]: [],
+    [ChangeTypeEnum.Renamed]: [],
+    [ChangeTypeEnum.TypeChanged]: [],
+    [ChangeTypeEnum.Unmerged]: [],
+    [ChangeTypeEnum.Unknown]: []
+  }
 
   if (exitCode !== 0) {
     if (isSubmodule) {
@@ -453,28 +460,60 @@ export const gitDiff = async ({
       )
     }
 
-    return []
+    return changedFiles
   }
 
-  const files = stdout
-    .split('\n')
-    .filter(Boolean)
-    .map(p => {
-      if (isSubmodule) {
-        return normalizePath(path.join(parentDir, p))
-      }
-      return normalizePath(p)
-    })
+  const lines = stdout.split('\n').filter(Boolean)
 
-  if (filePatterns.length === 0) {
-    return files
+  for (const line of lines) {
+    const [changeType, filePath] = line.split('\t')
+    const normalizedFilePath = isSubmodule
+      ? normalizePath(path.join(parentDir, filePath))
+      : normalizePath(filePath)
+
+    if (changeType.startsWith('R')) {
+      changedFiles[ChangeTypeEnum.Renamed].push(normalizedFilePath)
+    } else {
+      changedFiles[changeType as ChangeTypeEnum].push(normalizedFilePath)
+    }
+  }
+  return changedFiles
+}
+
+export const getFilteredChangedFiles = async ({
+  allDiffFiles,
+  filePatterns
+}: {
+  allDiffFiles: ChangedFiles
+  filePatterns: string[]
+}): Promise<ChangedFiles> => {
+  const changedFiles: ChangedFiles = {
+    [ChangeTypeEnum.Added]: [],
+    [ChangeTypeEnum.Copied]: [],
+    [ChangeTypeEnum.Deleted]: [],
+    [ChangeTypeEnum.Modified]: [],
+    [ChangeTypeEnum.Renamed]: [],
+    [ChangeTypeEnum.TypeChanged]: [],
+    [ChangeTypeEnum.Unmerged]: [],
+    [ChangeTypeEnum.Unknown]: []
   }
 
-  return mm(files, filePatterns, {
-    dot: true,
-    windows: IS_WINDOWS,
-    noext: true
-  })
+  for (const changeType of Object.keys(allDiffFiles)) {
+    const files = allDiffFiles[changeType as ChangeTypeEnum]
+    const hasFilePatterns = filePatterns.length > 0
+
+    if (hasFilePatterns) {
+      changedFiles[changeType as ChangeTypeEnum] = mm(files, filePatterns, {
+        dot: true,
+        windows: IS_WINDOWS,
+        noext: true
+      })
+    } else {
+      changedFiles[changeType as ChangeTypeEnum] = files
+    }
+  }
+
+  return changedFiles
 }
 
 export const gitLog = async ({
@@ -642,11 +681,11 @@ export const canDiffCommits = async ({
 export const getDirnameMaxDepth = ({
   pathStr,
   dirNamesMaxDepth,
-  excludeRoot
+  excludeCurrentDir
 }: {
   pathStr: string
   dirNamesMaxDepth?: number
-  excludeRoot?: boolean
+  excludeCurrentDir?: boolean
 }): string => {
   const pathArr = dirname(pathStr).split(path.sep)
   const maxDepth = Math.min(dirNamesMaxDepth || pathArr.length, pathArr.length)
@@ -656,7 +695,7 @@ export const getDirnameMaxDepth = ({
     output = path.join(output, pathArr[i])
   }
 
-  if (excludeRoot && output === '.') {
+  if (excludeCurrentDir && output === '.') {
     return ''
   }
 

test/test-è.txt

@@ -1 +1 @@
-This is a test file with non ascii character in the filename.
+This is a test file with non ASCII character in the filename.