Backmerge with restoreWorkspace fails when no stash entry is found

[gimiki]

Is there an existing issue for this?

• I have searched the existing issues

Current Behavior

If no stash entry is present, the restoreWorkspace (i.e. git stash pop) fails.

[10:43:05 AM] [semantic-release] [@saithodev/semantic-release-backmerge] › ℹ  Stashing uncommitted files from Git workspace.
[10:43:05 AM] [semantic-release] [@saithodev/semantic-release-backmerge] › ℹ  Performing back-merge into develop branch "release/qa".
[10:43:05 AM] [semantic-release] [@saithodev/semantic-release-backmerge] › ℹ  Branch is detached. Checking out release branch "master".
[10:43:05 AM] [semantic-release] [@saithodev/semantic-release-backmerge] › ℹ  Checking out develop branch "release/qa".
[10:43:05 AM] [semantic-release] [@saithodev/semantic-release-backmerge] › ℹ  Performing backmerge with "rebase" strategy.
[10:43:05 AM] [semantic-release] [@saithodev/semantic-release-backmerge] › ℹ  Loading plugins
[10:43:05 AM] [semantic-release] [@saithodev/semantic-release-backmerge] › ℹ  Executing "done" step of plugins
[10:43:05 AM] [semantic-release] [@saithodev/semantic-release-backmerge] › ℹ  Found 0 staged files for back-merge commit
[10:43:05 AM] [semantic-release] [@saithodev/semantic-release-backmerge] › ℹ  Pushing backmerge to develop branch release/qa
[10:43:06 AM] [semantic-release] [@saithodev/semantic-release-backmerge] › ℹ  Restoring stashed files to Git workspace.
catch error
Error: Command failed with exit code 1: git stash pop
No stash entries found.
    at makeError (/home/node/.npm-global/lib/node_modules/@saithodev/semantic-release-backmerge/node_modules/execa/lib/error.js:60:11)

Expected Behavior

Backmerge plugin should ignore the error if no stash entry is found.

Steps To Reproduce

• git repo without unstashed files
• backmerge config

  ['@saithodev/semantic-release-backmerge', {
    "backmergeBranches": ["develop"],
    "backmergeStrategy": "merge",
    "fastForwardMode": "ff",
    "clearWorkspace": true,
    "restoreWorkspace": true
  }]

• Run semantic-release

Environment

- "semantic-release@~21.0.5" "@semantic-release/changelog@~6.0.3"
- "@semantic-release/exec@~6.0.3" "@semantic-release/git@~10.0.1"
- "@saithodev/semantic-release-backmerge@~3.2.0"

Anything else?

No response

[saitho]

🎉 This issue has been resolved in version 4.0.1 🎉

The release is available on:

• npm package (@latest dist-tag)
• GitHub release
• v4.0.1

Your semantic-release bot 📦🚀