release: v8.0.2

* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>

.all-contributorsrc

@@ -241,6 +241,116 @@
         "bug",
         "ideas"
       ]
+    },
+    {
+      "login": "vincentchu12",
+      "name": "Vincent Chu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/23532586?v=4",
+      "profile": "https://github.com/vincentchu12",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "CWSites",
+      "name": "Matt H",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1242102?v=4",
+      "profile": "https://www.linkedin.com/in/cwsites",
+      "contributions": [
+        "doc",
+        "ideas"
+      ]
+    },
+    {
+      "login": "danielwerg",
+      "name": "danielwerg",
+      "avatar_url": "https://avatars.githubusercontent.com/u/35052399?v=4",
+      "profile": "https://github.com/danielwerg",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "koppor",
+      "name": "Oliver Kopp",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1366654?v=4",
+      "profile": "https://orcid.org/0000-0001-6962-4290",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "Glidias",
+      "name": "Glenn Ko",
+      "avatar_url": "https://avatars.githubusercontent.com/u/190195?v=4",
+      "profile": "https://github.com/Glidias",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "drewwells",
+      "name": "Drew Wells",
+      "avatar_url": "https://avatars.githubusercontent.com/u/239123?v=4",
+      "profile": "http://blog.madewithdrew.com/",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "JavierSegoviaCordoba",
+      "name": "Javier Segovia Córdoba",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7463564?v=4",
+      "profile": "https://kotlin.desarrollador-android.com/",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "Darylgolden",
+      "name": "Darylgolden",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9102529?v=4",
+      "profile": "https://github.com/Darylgolden",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "mcargille",
+      "name": "mcargille",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20142895?v=4",
+      "profile": "https://github.com/mcargille",
+      "contributions": [
+        "bug",
+        "code"
+      ]
+    },
+    {
+      "login": "secondmanveran",
+      "name": "secondman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/97000801?v=4",
+      "profile": "https://github.com/secondmanveran",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "prince-chrismc",
+      "name": "Chris Mc",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16867443?v=4",
+      "profile": "https://github.com/prince-chrismc",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Namyalg",
+      "name": "Namya LG",
+      "avatar_url": "https://avatars.githubusercontent.com/u/53875297?v=4",
+      "profile": "https://linkedin.com/in/namyalg",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.eslintrc.js

@@ -12,10 +12,12 @@ module.exports = {
     sourceType: 'module'
   },
   plugins: ['@typescript-eslint'],
+  ignorePatterns: ['lib/*'],
   rules: {
     'prettier/prettier': 'warn',
     'no-cond-assign': [2, 'except-parens'],
     'no-unused-vars': 0,
+    'no-redeclare': 0,
     '@typescript-eslint/no-unused-vars': 1,
     'no-empty': [
       'error',

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+  schedule:
+    - cron: '40 12 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

CHANGELOG.md

@@ -7,6 +7,69 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [8.0.2] - 2022-02-07
+
+### Fixed:
+
+- The `commit` input is now properly listed in the README. (#360)
+
+## [8.0.1] - 2022-01-23
+
+### Fixed:
+
+- Fixed a bug that prevented the `--allow-empty` flag from being used for the `commit` input. (#352)
+- Fixed README and CHANGELOG docs for the `pull` input, that were still showing the option to use `NO-PULL` to prevent pulling (while now it's the default behavior). (#354)
+- Added a paragraph to the FAQs section of the README, that explains how to work with PRs in v8. (#351)
+
+## [8.0.0] - 2022-01-20
+
+### Fixed:
+
+- **[BREAKING]** The action will now work with whatever ref has been checked out, without pulling or switching branches by default. You can still pull using the `pull` input and create a new branch with the newly-added `new_branch` input. For more info, check commit [`6fdb34e`](https://github.com/EndBug/add-and-commit/commit/6fdb34ed01d242c909eeb7e31bf1c4d37db43a54).
+
+### Removed:
+
+- **[BREAKING]** The `signoff` input has been removed, use `commit` instead. (#331)
+- **[BREAKING]** The `pull_strategy` input has been removed, use `pull` instead.
+- **[BREAKING]** The `branch` and `branch_mode` inputs have been removed, check commit [`6fdb34e`](https://github.com/EndBug/add-and-commit/commit/6fdb34ed01d242c909eeb7e31bf1c4d37db43a54) for more info.
+- **[BREAKING]** The `pull` input doesn't support `NO-PULL` anymore: if you don't want the action to pull, simply remove the input, as it's the default behavior now.
+
+### Added:
+
+- Added the `commit` input, that allows you to change the arguments for the `git commit` command. (#331)
+- Added the `new_branch` input. ([`6fdb34e`](https://github.com/EndBug/add-and-commit/commit/6fdb34ed01d242c909eeb7e31bf1c4d37db43a54))
+- Added the `commit_long_sha` output. (#349)
+
+## [7.5.0] - 2021-12-03
+
+### Added:
+
+- Support remote branch creation: use the `branch_mode` input to make the action create a new branch when there's no branch with the given name on the remote (#329)
+
+## [7.4.0] - 2021-09-30
+
+### Added:
+
+- Added `pull` input: you can use it to change the arguments of the `git pull` command (#294)
+
+### Changed:
+
+- Deprecated `pull_strategy`: use `pull` instead (#294)
+
+## [7.3.0] - 2021-09-06
+
+### Added:
+
+- Added custom committer support via the `committer_name` and `committer_email` inputs (#264)
+- Added `commit_sha` output (#275)
+- Added `pathspec_error_handling` input (#280)
+
+## [7.2.1] - 2021-05-11
+
+### Fixed:
+
+- Fixed an issue with missing outputs (#189)
+
 ## [7.2.0] - 2021-04-22
 
 ### Added:
@@ -242,7 +305,7 @@ First release
 
 #
 
-[unreleased]: https://github.com/EndBug/add-and-commit/compare/v7.2.0...HEAD
+[unreleased]: https://github.com/EndBug/add-and-commit/compare/v8.0.2...HEAD
 [1.0.0]: https://github.com/EndBug/add-and-commit/tree/v1.0.0
 [2.0.0]: https://github.com/EndBug/add-and-commit/compare/v1.0.0...v2.0.0
 [2.1.0]: https://github.com/EndBug/add-and-commit/compare/v2.0.0...v2.1.0
@@ -276,3 +339,10 @@ First release
 [7.1.1]: https://github.com/EndBug/add-and-commit/compare/v7.1.0...v7.1.1
 [7.1.2]: https://github.com/EndBug/add-and-commit/compare/v7.1.1...v7.1.2
 [7.2.0]: https://github.com/EndBug/add-and-commit/compare/v7.1.2...v7.2.0
+[7.2.1]: https://github.com/EndBug/add-and-commit/compare/v7.2.0...v7.2.1
+[7.3.0]: https://github.com/EndBug/add-and-commit/compare/v7.2.1...v7.3.0
+[7.4.0]: https://github.com/EndBug/add-and-commit/compare/v7.3.0...v7.4.0
+[7.5.0]: https://github.com/EndBug/add-and-commit/compare/v7.4.0...v7.5.0
+[8.0.0]: https://github.com/EndBug/add-and-commit/compare/v7.5.0...v8.0.0
+[8.0.1]: https://github.com/EndBug/add-and-commit/compare/v8.0.0...v8.0.1
+[8.0.2]: https://github.com/EndBug/add-and-commit/compare/v8.0.1...v8.0.2

README.md

@@ -1,37 +1,50 @@
 # Add & Commit
 
-[![Public workflows that use this action.](https://img.shields.io/endpoint?url=https%3A%2F%2Fapi-git-master.endbug.vercel.app%2Fapi%2Fgithub-actions%2Fused-by%3Faction%3DEndBug%2Fadd-and-commit%26badge%3Dtrue)](https://github.com/search?o=desc&q=EndBug+add-and-commit+path%3A.github%2Fworkflows+language%3AYAML&s=&type=Code)
+[![Public workflows that use this action.](https://img.shields.io/endpoint?url=https%3A%2F%2Fapi-endbug.vercel.app%2Fapi%2Fgithub-actions%2Fused-by%3Faction%3DEndBug%2Fadd-and-commit%26badge%3Dtrue)](https://github.com/search?o=desc&q=EndBug+add-and-commit+path%3A.github%2Fworkflows+language%3AYAML&s=&type=Code)
 [![All Contributors](https://img.shields.io/github/all-contributors/EndBug/add-and-commit)](#contributors-)
 
-You can use this GitHub Action to commit changes made in your workflow run directly to your repo: for example, you use it to lint your code, update documentation, commit updated builds, etc....
+You can use this GitHub Action to commit changes made in your workflow run directly to your repo: for example, you use it to lint your code, update documentation, commit updated builds, etc...
 
-This is **heavily** inspired by [git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) (by [Stefan Zweifel](https://github.com/stefanzweifel)): that action automatically detects changed files and commits them. While this is useful for most situations, this doesn't commit untracked files and can sometimes commit unintended changes (such as `package-lock.json` or similar, that may have happened during previous steps).  
-This action lets you choose the path that you want to use when adding & committing changes so that it works as you would normally do using `git` on your machine.
+## Table of contents
 
-## Usage
+- [Inputs](#inputs)
+- [Outputs](#outputs)
+- [FAQs](#faqs)
+- [Examples](#examples)
+- [Contributors](#contributors-)
+
+## Inputs
 
 Add a step like this to your workflow:
 
 ```yaml
-- uses: EndBug/add-and-commit@v7 # You can change this to use a specific version
+- uses: EndBug/add-and-commit@v8 # You can change this to use a specific version.
   with:
     # The arguments for the `git add` command (see the paragraph below for more info)
     # Default: '.'
     add: 'src'
 
-    # The name of the user that will be displayed as the author of the commit
+    # The name of the user that will be displayed as the author of the commit.
     # Default: depends on the default_author input
-    author_name: Your Name
+    author_name: Author Name
 
-    # The email of the user that will be displayed as the author of the commit
+    # The email of the user that will be displayed as the author of the commit.
     # Default: depends on the default_author input
     author_email: mail@example.com
 
-    # Name of the branch to use, if different from the one that triggered the workflow
-    # Default: the branch that triggered the run
-    branch: some-branch
+    # Additional arguments for the git commit command. The --message argument is already set by the message input.
+    # Default: ''
+    commit: --signoff
 
-    # The local path to the directory where your repository is located. You should use actions/checkout first to set it up
+    # The name of the custom committer you want to use, if different from the author of the commit.
+    # Default: the name of the author (set with either author_name or default_author)
+    committer_name: Committer Name
+
+    # The email of the custom committer you want to use, if different from the author of the commit.
+    # Default: the email of the author (set with either author_email or default_author)
+    committer_email: mail@example.com
+
+    # The local path to the directory where your repository is located. You should use actions/checkout first to set it up.
     # Default: '.'
     cwd: './path/to/the/repo'
 
@@ -39,16 +52,27 @@ Add a step like this to your workflow:
     # - github_actor -> UserName <UserName@users.noreply.github.com>
     # - user_info -> Your Display Name <your-actual@email.com>
     # - github_actions -> github-actions <email associated with the github logo>
-    # Default:
+    # Default: github_actor
     default_author: github_actor
 
-    # The message for the commit
+    # The message for the commit.
     # Default: 'Commit from GitHub Actions (name of the workflow)'
     message: 'Your commit message'
 
-    # The flag used on the pull strategy. Use NO-PULL to avoid the action pulling at all.
-    # Default: '--no-rebase'
-    pull_strategy: 'NO-PULL or --no-rebase or --no-ff or --rebase'
+    # If this input is set, the action will push the commit to a new branch with this name.
+    # Default: ''
+    new_branch: custom-new-branch
+
+    # The way the action should handle pathspec errors from the add and remove commands. Three options are available:
+    # - ignore -> errors will be logged but the step won't fail
+    # - exitImmediately -> the action will stop right away, and the step will fail
+    # - exitAtEnd -> the action will go on, every pathspec error will be logged at the end, the step will fail.
+    # Default: ignore
+    pathspec_error_handling: ignore
+
+    # Arguments for the git pull command. By default, the action does not pull.
+    # Default: ''
+    pull: '--rebase --autostash ...'
 
     # Whether to push the commit and, if any, its tags to the repo. It can also be used to set the git push arguments (see the paragraph below for more info)
     # Default: true
@@ -58,10 +82,6 @@ Add a step like this to your workflow:
     # Default: ''
     remove: './dir/old_file.js'
 
-    # Whether to use the --signoff option on `git commit` (only `true` and `false` are accepted)
-    # Default: false
-    signoff: true
-
     # Arguments for the git tag command (the tag name always needs to be the first word not preceded by an hyphen)
     # Default: ''
     tag: 'v1.0.0 --force'
@@ -72,21 +92,21 @@ Add a step like this to your workflow:
 Multiple options let you provide the git arguments that you want the action to use. It's important to note that these arguments **are not actually used with a CLI command**, but they are parsed by a package called [`string-argv`](https://npm.im/string-argv), and then used with [`simple-git`](https://npm.im/simple-git).  
 What does this mean for you? It means that string that contain a lot of nested quotes may be parsed incorrectly, and that specific ways of declaring arguments may not be supported by this libraries. If you're having issues with your argument strings you can check whether they're being parsed correctly either by [enabling debug logging](https://docs.github.com/en/actions/managing-workflow-runs/enabling-debug-logging) for your workflow runs or by testing it directly with `string-argv` ([RunKit demo](https://npm.runkit.com/string-argv)): if each argument and option is aprsed correctly you'll see an array where every string is an option or value.
 
-### Adding files:
+### Adding files
 
 The action adds files using a regular `git add` command, so you can put every kind of argument in the `add` option. For example, if you want to force-add a file: `./path/to/file.txt --force`.  
 The script will not stop if one of the git commands doesn't match any file. E.g.: if your command shows a "fatal: pathspec 'yourFile' did not match any files" error the action will go on.  
 You can also use JSON or YAML arrays (e.g. `'["first", "second"]'`, `"['first', 'second']"`) to make the action run multiple `git add` commands: the action will log how your input has been parsed. Please mind that your input still needs to be a string because of how GitHub Actions works with inputs: just write your array inside the string, the action will parse it later.
 
-### Deleting files:
+### Deleting files
 
 You can delete files with the `remove` option: that runs a `git rm` command that will stage the files in the given path for removal. As with the `add` argument, you can use every option `git rm` allows (e.g. add `--force` to ignore `.gitignore` rules).  
 The script will not stop if one of the git commands doesn't match any file. E.g.: if your command shows a "fatal: pathspec 'yourFile' did not match any files" error the action will go on.  
 You can also use JSON or YAML arrays (e.g. `'["first", "second"]'`, `"['first', 'second']"`) to make the action run multiple `git rm` commands: the action will log how your input has been parsed. Please mind that your input still needs to be a string because of how GitHub Actions works with inputs: just write your array inside the string, the action will parse it later.
 
-### Pushing:
+### Pushing
 
-By default the action runs the following command: `git push origin ${branch input} --set-upstream`. You can use the `push` input to modify this behavior, here's what you can set it to:
+By default the action runs the following command: `git push origin ${new_branch input} --set-upstream`. You can use the `push` input to modify this behavior, here's what you can set it to:
 
 - `true`: this is the default value, it will behave as usual.
 - `false`: this prevents the action from pushing at all, no `git push` command is run.
@@ -95,17 +115,74 @@ By default the action runs the following command: `git push origin ${branch inpu
 
 One way to use this is if you want to force push to a branch of your repo: you'll need to set the `push` input to, for example, `origin yourBranch --force`.
 
-### Tagging:
+### Creating a new branch
+
+If you want the action to commit in a new branch, you can use the `new_branch` input.
+
+Please note that if the branch exists, the action will still try push to it, but it's possible that the push will be rejected by the remote as non-straightforward.
+
+If that's the case, you need to make sure that the branch you want to commit to is already checked out before you run the action.  
+If you're **really** sure that you want to commit to that branch, you can also force-push by setting the `push` input to something like `origin yourBranchName --set-upstream --force`.
+
+If you want to commit files "across different branches", here are two ways to do it:
+
+1. You can check them out in two different directories, generate your files, move them to your destination and then run `add-and-commit` in the destination directory using the `cwd` input.
+2. You can manually commit those files with `git` commands as you would on your machine. There are several ways to do this depending on the scenario. One of them if to stash your changes, checkout the destination branch, and popping the stash. You can then use the `add-and-commit` action as usual. Please note that this is just an example and may not work for you, since your use case may be different.
+
+### Tagging
 
 You can use the `tag` option to enter the arguments for a `git add` command. In order for the action to isolate the tag name from the rest of the arguments, it should be the first word not preceded by an hyphen (e.g. `-a tag-name -m "some other stuff"` is ok).
 
-### Tokens:
+## Outputs
+
+The action provides these outputs:
+
+- `committed`: whether the action has created a commit (`'true'` or `'false'`)
+- `commit_long_sha`: the full SHA of the commit that has just been created
+- `commit_sha`: the short 7-character SHA of the commit that has just been created
+- `pushed`: whether the action has pushed to the remote (`'true'` or `'false'`)
+- `tagged`: whether the action has created a tag (`'true'` or `'false'`)
+
+For more info on how to use outputs, see ["Context and expression syntax"](https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions).
+
+## FAQs
+
+### Working with PRs
+
+By default, when you use `actions/checkout` on a PR, it will checkout the head commit in a detached head state.
+If you want to make some changes, you have to checkout the branch the PR is coming from in the head repo.  
+You can set it up like this:
+
+```yaml
+- uses: actions/checkout@v2
+    with:
+      repository: ${{ github.event.pull_request.head.repo.full_name }}
+      ref: ${{ github.event.pull_request.head.ref }}
+```
+
+You can find the full docs for payloads of `pull_request` events [here](https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#webhook-payload-example-32).
+
+If you're planning on running this only on "internal" PRs (where head and base are in the same repo) then you can omit the `repository` input.  
+If you're planning to use this with PRs coming from other forks, please keep in mind that you might not have write access to those repos.
+You can try setting up the repo with your PAT, as explained in the ["About tokens" paragraph](#about-tokens) of this section.
+
+Keep in mind that this "custom checkout" is meant only for PRs: if your workflow runs on multiple events (like `push` or `workflow_dispatch`), you could try having this step run only for `pull_request` events, while other ones will trigger the usual checkout.  
+If you wish to do so, you can use the `step.if` property, [here](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsif)'s the docs.
+
+### About tokens
 
 When pushing, the action uses the token that the local git repository has been configured with: that means that if you want to change it you'll need to do it in the steps that run before this action. For example: if you set up your repo with [`actions/checkout`](https://github.com/actions/checkout/) then you have to add the token there.  
 Changing the token with which the repo is configured can be useful if you want to run CI checks on the commit pushed by this action; anyway, it has to be set up outside of this action.
 
 The action automatically gets the GitHub token from a `github_token` input: this input should not be modified by the user, since it doesn't affect the commits as it's only used to access the GitHub API to get user info, in case they selected that option for the commit author.
 
+### The commit from the action is not triggering CI!
+
+That's because you're checking out the repo using the built-in [`GITHUB_TOKEN` secret](https://docs.github.com/en/actions/security-guides/automatic-token-authentication): GitHub sees that the push event has been triggered by a commit generated by CI, and doesn't run any further checks to avoid unintentional check loops.
+
+**If you're sure** that you want the commits generated during CI to trigger other workflow runs, you can checkout the repo using a [Personal Access Token (PAT)](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token): this will make the resulting commit the same as if you made it yourself.  
+If you're using `actions/checkout`, check out their [docs](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token) to see how to set your repo token.
+
 ### About `actions/checkout`
 
 The token you use when setting up the repo with this action will determine what token `add-and-commit` will use.  
@@ -117,17 +194,9 @@ Some users reported that they were getting an error:
 
 If you're getting this error and you're using `actions/checkout@v1`, try upgrading to `actions/checkout@v2`. If you're still having problems after upgrading, feel free to open an issue. Issue ref: [#146](https://github.com/EndBug/add-and-commit/issues/146)
 
-### Outputs:
+## Examples
 
-The action provides these outputs:
-
-- `committed`: whether the action has created a commit (`'true'` or `'false'`)
-- `pushed`: whether the action has pushed to the remote (`'true'` or `'false'`)
-- `tagged`: whether the action has created a tag (`'true'` or `'false'`)
-
-For more info on how to use outputs, see ["Context and expression syntax"](https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions).
-
-### Examples:
+### Different author/committer configurations
 
 If you don't want to use your GitHub username for the CI commits, you can use the `default_author` option to make it appear as if it was made by "github-actions"
 
@@ -139,11 +208,34 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: EndBug/add-and-commit@v7.0.0
+      - uses: EndBug/add-and-commit@v8
         with:
           default_author: github_actions
 ```
 
+You can also use the `committer_name` and `committer_email` inputs to make it appear as if GitHub Actions is the committer, here are a couple of example steps:
+
+<img src="https://user-images.githubusercontent.com/26386270/130594168-1d910710-e2d0-4b06-9324-cbe5dde59154.png" height=70/>
+
+```yaml
+- uses: EndBug/add-and-commit@v8
+  with:
+    message: Show GitHub Actions logo
+    committer_name: GitHub Actions
+    committer_email: actions@github.com
+```
+
+<img src="https://user-images.githubusercontent.com/26386270/130594443-b881fae7-3064-4020-a4cc-6db37ef0df65.png" height=70/>
+
+```yaml
+- uses: EndBug/add-and-commit@v8
+  with:
+    message: Show GitHub logo
+    committer_name: GitHub Actions
+    committer_email: 41898282+github-actions[bot]@users.noreply.github.com
+```
+
+### Automated linting
 
 Do you want to lint your JavaScript files, located in the `src` folder, with ESLint, so that fixable changes are done without your intervention? You can use a workflow like this:
 
@@ -171,7 +263,7 @@ jobs:
         run: eslint "src/**" --fix
 
       - name: Commit changes
-        uses: EndBug/add-and-commit@v7
+        uses: EndBug/add-and-commit@v8
         with:
           author_name: Your Name
           author_email: mail@example.com
@@ -179,6 +271,8 @@ jobs:
           add: '*.js'
 ```
 
+### Running the action in a different directory
+
 If you need to run the action on a repository that is not located in [`$GITHUB_WORKSPACE`](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/using-environment-variables#default-environment-variables), you can use the `cwd` option: the action uses a `cd` normal command, so the path should follow bash standards.
 
 ```yaml
@@ -200,7 +294,7 @@ jobs:
       - run: echo "123" > ./pathToRepo/file.txt
 
       # ...and then use the action as you would normally do, but providing the path to the repo
-      - uses: EndBug/add-and-commit@v7
+      - uses: EndBug/add-and-commit@v8
         with:
           message: 'Add the very useful text file'
           add: '*.txt --force'
@@ -247,6 +341,22 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://chaos.social/@rugk"><img src="https://avatars.githubusercontent.com/u/11966684?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rugk</b></sub></a><br /><a href="https://github.com/EndBug/add-and-commit/commits?author=rugk" title="Documentation">📖</a></td>
     <td align="center"><a href="https://xenoterracide.com"><img src="https://avatars.githubusercontent.com/u/5517?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Caleb Cushing</b></sub></a><br /><a href="https://github.com/EndBug/add-and-commit/issues?q=author%3Axenoterracide" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://ruohola.dev"><img src="https://avatars.githubusercontent.com/u/33625218?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Eero Ruohola</b></sub></a><br /><a href="https://github.com/EndBug/add-and-commit/issues?q=author%3Aruohola" title="Bug reports">🐛</a> <a href="#ideas-ruohola" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/vincentchu12"><img src="https://avatars.githubusercontent.com/u/23532586?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Chu</b></sub></a><br /><a href="https://github.com/EndBug/add-and-commit/issues?q=author%3Avincentchu12" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://www.linkedin.com/in/cwsites"><img src="https://avatars.githubusercontent.com/u/1242102?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matt H</b></sub></a><br /><a href="https://github.com/EndBug/add-and-commit/commits?author=CWSites" title="Documentation">📖</a> <a href="#ideas-CWSites" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/danielwerg"><img src="https://avatars.githubusercontent.com/u/35052399?v=4?s=100" width="100px;" alt=""/><br /><sub><b>danielwerg</b></sub></a><br /><a href="https://github.com/EndBug/add-and-commit/commits?author=danielwerg" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://orcid.org/0000-0001-6962-4290"><img src="https://avatars.githubusercontent.com/u/1366654?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Oliver Kopp</b></sub></a><br /><a href="#ideas-koppor" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/Glidias"><img src="https://avatars.githubusercontent.com/u/190195?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Glenn Ko</b></sub></a><br /><a href="#ideas-Glidias" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="http://blog.madewithdrew.com/"><img src="https://avatars.githubusercontent.com/u/239123?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Drew Wells</b></sub></a><br /><a href="#ideas-drewwells" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://kotlin.desarrollador-android.com/"><img src="https://avatars.githubusercontent.com/u/7463564?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Javier Segovia Córdoba</b></sub></a><br /><a href="#ideas-JavierSegoviaCordoba" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/Darylgolden"><img src="https://avatars.githubusercontent.com/u/9102529?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Darylgolden</b></sub></a><br /><a href="https://github.com/EndBug/add-and-commit/issues?q=author%3ADarylgolden" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/mcargille"><img src="https://avatars.githubusercontent.com/u/20142895?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mcargille</b></sub></a><br /><a href="https://github.com/EndBug/add-and-commit/issues?q=author%3Amcargille" title="Bug reports">🐛</a> <a href="https://github.com/EndBug/add-and-commit/commits?author=mcargille" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/secondmanveran"><img src="https://avatars.githubusercontent.com/u/97000801?v=4?s=100" width="100px;" alt=""/><br /><sub><b>secondman</b></sub></a><br /><a href="https://github.com/EndBug/add-and-commit/commits?author=secondmanveran" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/prince-chrismc"><img src="https://avatars.githubusercontent.com/u/16867443?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Chris Mc</b></sub></a><br /><a href="https://github.com/EndBug/add-and-commit/commits?author=prince-chrismc" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://linkedin.com/in/namyalg"><img src="https://avatars.githubusercontent.com/u/53875297?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Namya LG</b></sub></a><br /><a href="https://github.com/EndBug/add-and-commit/commits?author=Namyalg" title="Documentation">📖</a></td>
   </tr>
 </table>
 
@@ -257,6 +367,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 
 This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
 
+### Additional credits
+
+This action is inspired by [`git-auto-commit-action`](https://github.com/stefanzweifel/git-auto-commit-action) by [Stefan Zweifel](https://github.com/stefanzweifel).
+
 ## License
 
 This action is distributed under the MIT license, check the [license](LICENSE) for more info.

action.yml

@@ -1,5 +1,5 @@
 name: Add & Commit
-description: Add & commit files from a path directly from GitHub Actions
+description: Automatically commit changes made in your workflow run directly to your repo
 
 inputs:
   add:
@@ -12,8 +12,14 @@ inputs:
   author_email:
     description: The email of the user that will be displayed as the author of the commit
     required: false
-  branch:
-    description: Name of the branch to use, if different from the one that triggered the workflow
+  commit:
+    description: Additional arguments for the git commit command
+    required: false
+  committer_name:
+    description: The name of the custom committer you want to use
+    required: false 
+  committer_email:
+    description: The email of the custom committer you want to use
     required: false
   cwd:
     description: The directory where your repository is located. You should use actions/checkout first to set it up
@@ -26,10 +32,16 @@ inputs:
   message:
     description: The message for the commit
     required: false
-  pull_strategy:
-    description: The flag used on the pull strategy. Use NO-PULL to avoid the action pulling at all.
+  new_branch:
+    description: The name of the branch to create.
+    required: false
+  pathspec_error_handling:
+    description: The way the action should handle pathspec errors from the add and remove commands.
+    required: false
+    default: ignore
+  pull:
+    description: Arguments for the git pull command. By default, the action does not pull.
     required: false
-    default: '--no-rebase'
   push:
     description: Whether to push the commit and, if any, its tags to the repo. It can also be used to set the git push arguments (more info in the README)
     required: false
@@ -37,9 +49,6 @@ inputs:
   remove:
     description: Arguments for the git rm command
     required: false
-  signoff:
-    description: Whether to use the --signoff option on git commit
-    required: false
   tag:
     description: Arguments for the git tag command (the tag name always needs to be the first word not preceded by a hyphen)
     required: false
@@ -53,6 +62,10 @@ inputs:
 outputs:
   committed:
     description: Whether the action has created a commit.
+  commit_long_sha:
+    description: The complete SHA of the commit that has been created.
+  commit_sha:
+    description: The short SHA of the commit that has been created.
   pushed:
     description: Whether the action has pushed to the remote.
   tagged:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "add-and-commit",
-  "version": "7.2.0",
+  "version": "8.0.2",
   "private": true,
   "description": "Add & commit files from a path directly from GitHub Actions",
   "main": "lib/index.js",
@@ -31,26 +31,26 @@
   },
   "homepage": "https://github.com/EndBug/add-and-commit#readme",
   "dependencies": {
-    "@actions/core": "^1.2.7",
+    "@actions/core": "^1.6.0",
     "actions-toolkit": "github:EndBug/actions-toolkit#core-actions",
     "js-yaml": "^4.1.0",
     "simple-git": "^2.27.0",
     "string-argv": "^0.3.1"
   },
   "devDependencies": {
-    "@types/js-yaml": "^4.0.0",
+    "@types/js-yaml": "^4.0.5",
     "@types/node": "^12.12.54",
-    "@typescript-eslint/eslint-plugin": "^4.22.0",
-    "@typescript-eslint/parser": "^4.22.0",
-    "@vercel/ncc": "^0.27.0",
+    "@typescript-eslint/eslint-plugin": "^4.33.0",
+    "@typescript-eslint/parser": "^4.33.0",
+    "@vercel/ncc": "^0.33.1",
     "all-contributors-cli": "^6.20.0",
-    "eslint": "^7.24.0",
-    "eslint-config-prettier": "^8.2.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "husky": "^6.0.0",
-    "prettier": "^2.2.1",
-    "ts-node": "^9.1.1",
-    "typescript": "^4.2.4",
+    "eslint": "^7.32.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "husky": "^7.0.4",
+    "prettier": "^2.5.1",
+    "ts-node": "^10.4.0",
+    "typescript": "^4.5.5",
     "yamljs": "^0.3.0"
   }
 }

src/io.ts

@@ -0,0 +1,234 @@
+import * as core from '@actions/core'
+import { getUserInfo, parseInputArray } from './util'
+
+interface InputTypes {
+  add: string
+  author_name: string
+  author_email: string
+  commit: string | undefined
+  committer_name: string
+  committer_email: string
+  cwd: string
+  default_author: 'github_actor' | 'user_info' | 'github_actions'
+  message: string
+  new_branch: string | undefined
+  pathspec_error_handling: 'ignore' | 'exitImmediately' | 'exitAtEnd'
+  pull: string | undefined
+  push: string
+  remove: string | undefined
+  tag: string | undefined
+
+  github_token: string | undefined
+}
+export type input = keyof InputTypes
+
+interface OutputTypes {
+  committed: 'true' | 'false'
+  commit_long_sha: string | undefined
+  commit_sha: string | undefined
+  pushed: 'true' | 'false'
+  tagged: 'true' | 'false'
+}
+export type output = keyof OutputTypes
+
+export const outputs: OutputTypes = {
+  committed: 'false',
+  commit_long_sha: undefined,
+  commit_sha: undefined,
+  pushed: 'false',
+  tagged: 'false'
+}
+// Setup default output values
+Object.entries(outputs).forEach(([name, value]) => core.setOutput(name, value))
+
+export function getInput<T extends input>(name: T, parseAsBool: true): boolean
+export function getInput<T extends input>(
+  name: T,
+  parseAsBool?: false
+): InputTypes[T]
+export function getInput<T extends input>(
+  name: T,
+  parseAsBool = false
+): InputTypes[T] | boolean {
+  if (parseAsBool) return core.getBooleanInput(name)
+  // @ts-expect-error
+  return core.getInput(name)
+}
+
+export function setOutput<T extends output>(name: T, value: OutputTypes[T]) {
+  core.debug(`Setting output: ${name}=${value}`)
+  outputs[name] = value
+  core.setOutput(name, value)
+}
+
+export function logOutputs() {
+  core.startGroup('Outputs')
+  for (const key in outputs) {
+    core.info(`${key}: ${outputs[key]}`)
+  }
+  core.endGroup()
+}
+
+export async function checkInputs() {
+  function setInput(input: input, value: string | undefined) {
+    if (value) return (process.env[`INPUT_${input.toUpperCase()}`] = value)
+    else return delete process.env[`INPUT_${input.toUpperCase()}`]
+  }
+  function setDefault(input: input, value: string) {
+    if (!getInput(input)) setInput(input, value)
+    return getInput(input)
+  }
+
+  // #region add, remove
+  if (!getInput('add') && !getInput('remove'))
+    throw new Error(
+      "Both 'add' and 'remove' are empty, the action has nothing to do."
+    )
+
+  if (getInput('add')) {
+    const parsed = parseInputArray(getInput('add'))
+    if (parsed.length == 1)
+      core.info('Add input parsed as single string, running 1 git add command.')
+    else if (parsed.length > 1)
+      core.info(
+        `Add input parsed as string array, running ${parsed.length} git add commands.`
+      )
+    else core.setFailed('Add input: array length < 1')
+  }
+  if (getInput('remove')) {
+    const parsed = parseInputArray(getInput('remove') || '')
+    if (parsed.length == 1)
+      core.info(
+        'Remove input parsed as single string, running 1 git rm command.'
+      )
+    else if (parsed.length > 1)
+      core.info(
+        `Remove input parsed as string array, running ${parsed.length} git rm commands.`
+      )
+    else core.setFailed('Remove input: array length < 1')
+  }
+  // #endregion
+
+  // #region default_author
+  const default_author_valid = ['github_actor', 'user_info', 'github_actions']
+  if (!default_author_valid.includes(getInput('default_author')))
+    throw new Error(
+      `'${getInput(
+        'default_author'
+      )}' is not a valid value for default_author. Valid values: ${default_author_valid.join(
+        ', '
+      )}`
+    )
+  // #endregion
+
+  // #region author_name, author_email
+  let name, email
+  switch (getInput('default_author')) {
+    case 'github_actor': {
+      name = process.env.GITHUB_ACTOR
+      email = `${process.env.GITHUB_ACTOR}@users.noreply.github.com`
+      break
+    }
+
+    case 'user_info': {
+      if (!getInput('author_name') || !getInput('author_email')) {
+        const res = await getUserInfo(process.env.GITHUB_ACTOR)
+        if (!res?.name)
+          core.warning("Couldn't fetch author name, filling with github_actor.")
+        if (!res?.email)
+          core.warning(
+            "Couldn't fetch author email, filling with github_actor."
+          )
+
+        res?.name && (name = res?.name)
+        res?.email && (email = res.email)
+        if (name && email) break
+      }
+
+      !name && (name = process.env.GITHUB_ACTOR)
+      !email && (email = `${process.env.GITHUB_ACTOR}@users.noreply.github.com`)
+      break
+    }
+
+    case 'github_actions': {
+      name = 'github-actions'
+      email = '41898282+github-actions[bot]@users.noreply.github.com'
+      break
+    }
+
+    default:
+      throw new Error(
+        'This should not happen, please contact the author of this action. (checkInputs.author)'
+      )
+  }
+
+  setDefault('author_name', name)
+  setDefault('author_email', email)
+  core.info(
+    `> Using '${getInput('author_name')} <${getInput(
+      'author_email'
+    )}>' as author.`
+  )
+  // #endregion
+
+  // #region committer_name, committer_email
+  if (getInput('committer_name') || getInput('committer_email'))
+    core.info(
+      `> Using custom committer info: ${
+        getInput('committer_name') ||
+        getInput('author_name') + ' [from author info]'
+      } <${
+        getInput('committer_email') ||
+        getInput('author_email') + ' [from author info]'
+      }>`
+    )
+
+  setDefault('committer_name', getInput('author_name'))
+  setDefault('committer_email', getInput('author_email'))
+  core.debug(
+    `Committer: ${getInput('committer_name')} <${getInput('committer_email')}>`
+  )
+  // #endregion
+
+  // #region message
+  setDefault(
+    'message',
+    `Commit from GitHub Actions (${process.env.GITHUB_WORKFLOW})`
+  )
+  core.info(`> Using "${getInput('message')}" as commit message.`)
+  // #endregion
+
+  // #region pathspec_error_handling
+  const peh_valid = ['ignore', 'exitImmediately', 'exitAtEnd']
+  if (!peh_valid.includes(getInput('pathspec_error_handling')))
+    throw new Error(
+      `"${getInput(
+        'pathspec_error_handling'
+      )}" is not a valid value for the 'pathspec_error_handling' input. Valid values are: ${peh_valid.join(
+        ', '
+      )}`
+    )
+  // #endregion
+
+  // #region push
+  if (getInput('push')) {
+    // It has to be either 'true', 'false', or any other string (use as arguments)
+    let value: string | boolean
+
+    try {
+      value = getInput('push', true)
+    } catch {
+      value = getInput('push')
+    }
+
+    core.debug(`Current push option: '${value}' (parsed as ${typeof value})`)
+  }
+  // #endregion
+
+  // #region github_token
+  if (!getInput('github_token'))
+    core.warning(
+      'No github_token has been detected, the action may fail if it needs to use the API'
+    )
+  // #endregion
+}

src/main.ts

@@ -1,45 +1,54 @@
 import * as core from '@actions/core'
 import path from 'path'
 import simpleGit, { Response } from 'simple-git'
-import YAML from 'js-yaml'
-import {
-  getInput,
-  getUserInfo,
-  Input,
-  log,
-  matchGitArgs,
-  parseBool,
-  setOutput,
-  tools
-} from './util'
+import { checkInputs, getInput, logOutputs, setOutput } from './io'
+import { log, matchGitArgs, parseInputArray } from './util'
 
 const baseDir = path.join(process.cwd(), getInput('cwd') || '')
 const git = simpleGit({ baseDir })
+
+const exitErrors: Error[] = []
+
 core.info(`Running in ${baseDir}`)
 ;(async () => {
-  await checkInputs().catch(core.setFailed)
+  await checkInputs()
 
   core.startGroup('Internal logs')
   core.info('> Staging files...')
 
+  const peh = getInput('pathspec_error_handling')
+
   if (getInput('add')) {
     core.info('> Adding files...')
-    await add()
+    await add(peh == 'ignore' ? 'pathspec' : 'none')
   } else core.info('> No files to add.')
 
   if (getInput('remove')) {
     core.info('> Removing files...')
-    await remove()
+    await remove(peh == 'ignore' ? 'pathspec' : 'none')
   } else core.info('> No files to remove.')
 
   core.info('> Checking for uncommitted changes in the git working tree...')
   const changedFiles = (await git.diffSummary(['--cached'])).files.length
-  if (changedFiles > 0) {
+  // continue if there are any changes or if the allow-empty commit argument is included
+  if (
+    changedFiles > 0 ||
+    matchGitArgs(getInput('commit') || '').includes('--allow-empty')
+  ) {
     core.info(`> Found ${changedFiles} changed files.`)
+    core.debug(
+      `--allow-empty argument detected: ${matchGitArgs(
+        getInput('commit') || ''
+      ).includes('--allow-empty')}`
+    )
 
     await git
       .addConfig('user.email', getInput('author_email'), undefined, log)
       .addConfig('user.name', getInput('author_name'), undefined, log)
+      .addConfig('author.email', getInput('author_email'), undefined, log)
+      .addConfig('author.name', getInput('author_name'), undefined, log)
+      .addConfig('committer.email', getInput('committer_email'), undefined, log)
+      .addConfig('committer.name', getInput('committer_name'), undefined, log)
     core.debug(
       '> Current git config\n' +
         JSON.stringify((await git.listConfig()).all, null, 2)
@@ -47,53 +56,48 @@ core.info(`Running in ${baseDir}`)
 
     await git.fetch(['--tags', '--force'], log)
 
-    core.info('> Switching/creating branch...')
-    await git
-      .checkout(getInput('branch'), undefined, log)
-      .catch(() => git.checkoutLocalBranch(getInput('branch'), log))
-
-    if (getInput('pull_strategy') == 'NO-PULL')
-      core.info('> Not pulling from repo.')
-    else {
-      core.info('> Pulling from remote...')
-      await git.fetch(undefined, log).pull(
-        undefined,
-        undefined,
-        {
-          [getInput('pull_strategy')]: null
-        },
-        log
-      )
+    const targetBranch = getInput('new_branch')
+    if (targetBranch) {
+      await git
+        .checkout(targetBranch)
+        .then(() => {
+          log(undefined, `'${targetBranch}' branch already existed.`)
+        })
+        .catch(() => {
+          log(undefined, `Creating '${targetBranch}' branch.`)
+          return git.checkoutLocalBranch(targetBranch, log)
+        })
     }
 
-    core.info('> Re-staging files...')
-    if (getInput('add')) await add({ ignoreErrors: true })
-    if (getInput('remove')) await remove({ ignoreErrors: true })
+    const pullOption = getInput('pull')
+    if (pullOption) {
+      core.info('> Pulling from remote...')
+      core.debug(`Current git pull arguments: ${pullOption}`)
+      await git
+        .fetch(undefined, log)
+        .pull(undefined, undefined, matchGitArgs(pullOption), log)
+    } else core.info('> Not pulling from repo.')
 
     core.info('> Creating commit...')
-    await git.commit(
-      getInput('message'),
-      undefined,
-      {
-        '--author': `"${getInput('author_name')} <${getInput(
-          'author_email'
-        )}>"`,
-        ...(getInput('signoff')
-          ? {
-              '--signoff': null
-            }
-          : {})
-      },
-      (err, data?) => {
-        if (data) setOutput('committed', 'true')
-        return log(err, data)
-      }
-    )
+    const commitData = await git
+      .commit(getInput('message'), matchGitArgs(getInput('commit') || ''))
+      .catch((err) => {
+        log(err)
+      })
+    if (commitData) {
+      log(undefined, commitData)
+      setOutput('committed', 'true')
+      setOutput('commit_sha', commitData.commit)
+      await git
+        .revparse(commitData.commit)
+        .then((long_sha) => setOutput('commit_long_sha', long_sha))
+        .catch((err) => core.warning(`Couldn't parse long SHA:\n${err}`))
+    }
 
     if (getInput('tag')) {
       core.info('> Tagging commit...')
       await git
-        .tag(matchGitArgs(getInput('tag')), (err, data?) => {
+        .tag(matchGitArgs(getInput('tag') || ''), (err, data?) => {
           if (data) setOutput('tagged', 'true')
           return log(err, data)
         })
@@ -104,18 +108,25 @@ core.info(`Running in ${baseDir}`)
         .catch((err) => core.setFailed(err))
     } else core.info('> No tag info provided.')
 
-    const pushOption = parseBool(getInput('push')) ?? getInput('push')
+    let pushOption: string | boolean
+    try {
+      pushOption = getInput('push', true)
+    } catch {
+      pushOption = getInput('push')
+    }
     if (pushOption) {
       // If the options is `true | string`...
       core.info('> Pushing commit to repo...')
 
       if (pushOption === true) {
         core.debug(
-          `Running: git push origin ${getInput('branch')} --set-upstream`
+          `Running: git push origin ${
+            getInput('new_branch') || ''
+          } --set-upstream`
         )
         await git.push(
           'origin',
-          getInput('branch'),
+          getInput('new_branch'),
           { '--set-upstream': null },
           (err, data?) => {
             if (data) setOutput('pushed', 'true')
@@ -150,7 +161,7 @@ core.info(`Running in ${baseDir}`)
                 {
                   '--delete': null,
                   origin: null,
-                  [matchGitArgs(getInput('tag')).filter(
+                  [matchGitArgs(getInput('tag') || '').filter(
                     (w) => !w.startsWith('-')
                   )[0]]: null
                 },
@@ -168,6 +179,14 @@ core.info(`Running in ${baseDir}`)
     core.info('> Working tree clean. Nothing to commit.')
   }
 })()
+  .then(() => {
+    // Check for exit errors
+    if (exitErrors.length == 1) throw exitErrors[0]
+    else if (exitErrors.length > 1) {
+      exitErrors.forEach((e) => core.error(e))
+      throw 'There have been multiple runtime errors.'
+    }
+  })
   .then(logOutputs)
   .catch((e) => {
     core.endGroup()
@@ -175,175 +194,9 @@ core.info(`Running in ${baseDir}`)
     core.setFailed(e)
   })
 
-async function checkInputs() {
-  function setInput(input: Input, value: string | undefined) {
-    if (value) return (process.env[`INPUT_${input.toUpperCase()}`] = value)
-    else return delete process.env[`INPUT_${input.toUpperCase()}`]
-  }
-  function setDefault(input: Input, value: string) {
-    if (!getInput(input)) setInput(input, value)
-    return getInput(input)
-  }
-
-  const eventPath = process.env.GITHUB_EVENT_PATH,
-    event = eventPath && require(eventPath),
-    isPR = process.env.GITHUB_EVENT_NAME?.includes('pull_request'),
-    defaultBranch = isPR
-      ? (event?.pull_request?.head?.ref as string)
-      : process.env.GITHUB_REF?.substring(11)
-
-  // #region add, remove
-  if (!getInput('add') && !getInput('remove'))
-    throw new Error(
-      "Both 'add' and 'remove' are empty, the action has nothing to do."
-    )
-
-  if (getInput('add')) {
-    const parsed = parseInputArray(getInput('add'))
-    if (parsed.length == 1)
-      core.info('Add input parsed as single string, running 1 git add command.')
-    else if (parsed.length > 1)
-      core.info(
-        `Add input parsed as string array, running ${parsed.length} git add commands.`
-      )
-    else core.setFailed('Add input: array length < 1')
-  }
-  if (getInput('remove')) {
-    const parsed = parseInputArray(getInput('remove'))
-    if (parsed.length == 1)
-      core.info(
-        'Remove input parsed as single string, running 1 git rm command.'
-      )
-    else if (parsed.length > 1)
-      core.info(
-        `Remove input parsed as string array, running ${parsed.length} git rm commands.`
-      )
-    else core.setFailed('Remove input: array length < 1')
-  }
-  // #endregion
-
-  // #region default_author
-  const default_author_valid = ['github_actor', 'user_info', 'github_actions']
-  if (!default_author_valid.includes(getInput('default_author')))
-    throw new Error(
-      `'${getInput(
-        'default_author'
-      )}' is not a valid value for default_author. Valid values: ${default_author_valid.join(
-        ', '
-      )}`
-    )
-
-  // #region author_name, author_email
-  let name, email
-  switch (getInput('default_author')) {
-    case 'github_actor': {
-      name = process.env.GITHUB_ACTOR
-      email = `${process.env.GITHUB_ACTOR}@users.noreply.github.com`
-      break
-    }
-
-    case 'user_info': {
-      if (!getInput('author_name') || !getInput('author_email')) {
-        const res = await getUserInfo(process.env.GITHUB_ACTOR)
-        if (!res?.name)
-          core.warning("Couldn't fetch author name, filling with github_actor.")
-        if (!res?.email)
-          core.warning(
-            "Couldn't fetch author email, filling with github_actor."
-          )
-
-        res?.name && (name = res?.name)
-        res?.email && (email = res.email)
-        if (name && email) break
-      }
-
-      !name && (name = process.env.GITHUB_ACTOR)
-      !email && (email = `${process.env.GITHUB_ACTOR}@users.noreply.github.com`)
-      break
-    }
-
-    case 'github_actions': {
-      name = 'github-actions'
-      email = '41898282+github-actions[bot]@users.noreply.github.com'
-      break
-    }
-
-    default:
-      throw new Error(
-        'This should not happen, please contact the author of this action. (checkInputs.author)'
-      )
-  }
-
-  setDefault('author_name', name)
-  setDefault('author_email', email)
-  core.info(
-    `> Using '${getInput('author_name')} <${getInput(
-      'author_email'
-    )}>' as author.`
-  )
-  // #endregion
-
-  // #region message
-  setDefault(
-    'message',
-    `Commit from GitHub Actions (${process.env.GITHUB_WORKFLOW})`
-  )
-  core.info(`> Using "${getInput('message')}" as commit message.`)
-  // #endregion
-
-  // #region branch
-  const branch = setDefault('branch', defaultBranch || '')
-  if (isPR)
-    core.info(`> Running for a PR, the action will use '${branch}' as ref.`)
-  // #endregion
-
-  // #region signoff
-  if (getInput('signoff')) {
-    const parsed = parseBool(getInput('signoff'))
-
-    if (parsed === undefined)
-      throw new Error(
-        `"${getInput(
-          'signoff'
-        )}" is not a valid value for the 'signoff' input: only "true" and "false" are allowed.`
-      )
-
-    if (!parsed) setInput('signoff', undefined)
-
-    core.debug(
-      `Current signoff option: ${getInput('signoff')} (${typeof getInput(
-        'signoff'
-      )})`
-    )
-  }
-  // #endregion
-
-  // #region pull_strategy
-  if (getInput('pull_strategy') == 'NO-PULL')
-    core.debug("NO-PULL found: won't pull from remote.")
-  // #endregion
-
-  // #region push
-  if (getInput('push')) {
-    // It has to be either 'true', 'false', or any other string (use as arguments)
-    const parsed = parseBool(getInput('push'))
-
-    core.debug(
-      `Current push option: '${getInput('push')}' (parsed as ${typeof parsed})`
-    )
-  }
-  // #endregion
-
-  // #region github_token
-  if (!getInput('github_token'))
-    core.warning(
-      'No github_token has been detected, the action may fail if it needs to use the API'
-    )
-}
-
-async function add({ logWarning = true, ignoreErrors = false } = {}): Promise<
-  (void | Response<void>)[]
-> {
+async function add(
+  ignoreErrors: 'all' | 'pathspec' | 'none' = 'none'
+): Promise<(void | Response<void>)[]> {
   const input = getInput('add')
   if (!input) return []
 
@@ -356,19 +209,26 @@ async function add({ logWarning = true, ignoreErrors = false } = {}): Promise<
       // If any of them fails, the whole function will return a Promise rejection
       await git
         .add(matchGitArgs(args), (err: any, data?: any) =>
-          log(ignoreErrors ? null : err, data)
+          log(ignoreErrors == 'all' ? null : err, data)
         )
         .catch((e: Error) => {
-          if (ignoreErrors) return
+          // if I should ignore every error, return
+          if (ignoreErrors == 'all') return
+
+          // if it's a pathspec error...
           if (
             e.message.includes('fatal: pathspec') &&
-            e.message.includes('did not match any files') &&
-            logWarning
-          )
-            core.warning(
-              `Add command did not match any file:\n  git add ${args}`
-            )
-          else throw e
+            e.message.includes('did not match any files')
+          ) {
+            if (ignoreErrors == 'pathspec') return
+
+            const peh = getInput('pathspec_error_handling'),
+              err = new Error(
+                `Add command did not match any file: git add ${args}`
+              )
+            if (peh == 'exitImmediately') throw err
+            if (peh == 'exitAtEnd') exitErrors.push(err)
+          } else throw e
         })
     )
   }
@@ -376,10 +236,9 @@ async function add({ logWarning = true, ignoreErrors = false } = {}): Promise<
   return res
 }
 
-async function remove({
-  logWarning = true,
-  ignoreErrors = false
-} = {}): Promise<(void | Response<void>)[]> {
+async function remove(
+  ignoreErrors: 'all' | 'pathspec' | 'none' = 'none'
+): Promise<(void | Response<void>)[]> {
   const input = getInput('remove')
   if (!input) return []
 
@@ -392,63 +251,29 @@ async function remove({
       // If any of them fails, the whole function will return a Promise rejection
       await git
         .rm(matchGitArgs(args), (e: any, d?: any) =>
-          log(ignoreErrors ? null : e, d)
+          log(ignoreErrors == 'all' ? null : e, d)
         )
         .catch((e: Error) => {
-          if (ignoreErrors) return
+          // if I should ignore every error, return
+          if (ignoreErrors == 'all') return
+
+          // if it's a pathspec error...
           if (
             e.message.includes('fatal: pathspec') &&
             e.message.includes('did not match any files')
-          )
-            logWarning &&
-              core.warning(
+          ) {
+            if (ignoreErrors == 'pathspec') return
+
+            const peh = getInput('pathspec_error_handling'),
+              err = new Error(
                 `Remove command did not match any file:\n  git rm ${args}`
               )
-          else throw e
+            if (peh == 'exitImmediately') throw err
+            if (peh == 'exitAtEnd') exitErrors.push(err)
+          } else throw e
         })
     )
   }
 
   return res
 }
-
-/**
- * Tries to parse a JSON array, then a YAML array.
- * If both fail, it returns an array containing the input value as its only element
- */
-function parseInputArray(input: string): string[] {
-  try {
-    const json = JSON.parse(input)
-    if (
-      json &&
-      Array.isArray(json) &&
-      json.every((e) => typeof e == 'string')
-    ) {
-      core.debug(`Input parsed as JSON array of length ${json.length}`)
-      return json
-    }
-  } catch {}
-
-  try {
-    const yaml = YAML.load(input)
-    if (
-      yaml &&
-      Array.isArray(yaml) &&
-      yaml.every((e) => typeof e == 'string')
-    ) {
-      core.debug(`Input parsed as YAML array of length ${yaml.length}`)
-      return yaml
-    }
-  } catch {}
-
-  core.debug('Input parsed as single string')
-  return [input]
-}
-
-function logOutputs() {
-  core.startGroup('Outputs')
-  for (const key in tools.outputs) {
-    core.info(`${key}: ${tools.outputs[key]}`)
-  }
-  core.endGroup()
-}

src/util.ts

@@ -1,26 +1,12 @@
 import { parseArgsStringToArgv } from 'string-argv'
 import * as core from '@actions/core'
+import YAML from 'js-yaml'
 import { Toolkit } from 'actions-toolkit'
-
-export type Input =
-  | 'add'
-  | 'author_name'
-  | 'author_email'
-  | 'branch'
-  | 'cwd'
-  | 'default_author'
-  | 'message'
-  | 'pull_strategy'
-  | 'push'
-  | 'remove'
-  | 'signoff'
-  | 'tag'
-  | 'github_token'
-
-export type Output = 'committed' | 'pushed' | 'tagged'
+import fs from 'fs'
+import { input, output } from './io'
 
 type RecordOf<T extends string> = Record<T, string | undefined>
-export const tools = new Toolkit<RecordOf<Input>, RecordOf<Output>>({
+export const tools = new Toolkit<RecordOf<input>, RecordOf<output>>({
   secrets: [
     'GITHUB_EVENT_PATH',
     'GITHUB_EVENT_NAME',
@@ -28,15 +14,6 @@ export const tools = new Toolkit<RecordOf<Input>, RecordOf<Output>>({
     'GITHUB_ACTOR'
   ]
 })
-tools.outputs = {
-  committed: 'false',
-  pushed: 'false',
-  tagged: 'false'
-}
-
-export function getInput(name: Input) {
-  return tools.inputs[name] || ''
-}
 
 export async function getUserInfo(username?: string) {
   if (!username) return undefined
@@ -91,14 +68,50 @@ export function matchGitArgs(string: string) {
   return parsed
 }
 
-export function parseBool(value: any) {
+/**
+ * Tries to parse a JSON array, then a YAML array.
+ * If both fail, it returns an array containing the input value as its only element
+ */
+export function parseInputArray(input: string): string[] {
   try {
-    const parsed = JSON.parse(value)
-    if (typeof parsed == 'boolean') return parsed
+    const json = JSON.parse(input)
+    if (
+      json &&
+      Array.isArray(json) &&
+      json.every((e) => typeof e == 'string')
+    ) {
+      core.debug(`Input parsed as JSON array of length ${json.length}`)
+      return json
+    }
   } catch {}
+
+  try {
+    const yaml = YAML.load(input)
+    if (
+      yaml &&
+      Array.isArray(yaml) &&
+      yaml.every((e) => typeof e == 'string')
+    ) {
+      core.debug(`Input parsed as YAML array of length ${yaml.length}`)
+      return yaml
+    }
+  } catch {}
+
+  core.debug('Input parsed as single string')
+  return [input]
 }
 
-export function setOutput(name: Output, value: 'true' | 'false') {
-  core.debug(`Setting output: ${name}=${value}`)
-  tools.outputs[name] = value
+export function readJSON(filePath: string) {
+  let fileContent: string
+  try {
+    fileContent = fs.readFileSync(filePath, { encoding: 'utf8' })
+  } catch {
+    throw `Couldn't read file. File path: ${filePath}`
+  }
+
+  try {
+    return JSON.parse(fileContent)
+  } catch {
+    throw `Couldn't parse file to JSON. File path: ${filePath}`
+  }
 }