fix: properly identify rebase and then ff

[lampajr]

Thank you for submitting this pull request

fixes #213

How Has This Been Tested?

Tested against a real example:

$ node dist/cli/index.js -pr https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23742 -tb release/7.0 -d --git-client codeberg -f /tmp/test2 --auto-no-squash

Got:

[WARN ] Dry run enabled
[INFO ] Auth argument not provided, checking available tokens from env..
[INFO ] Git token not found in the environment
[DEBUG] Setting up codeberg client: apiUrl=https://code.ffmpeg.org/api/v1, token=****
[DEBUG] Parsing configs..
[DEBUG] Fetching pull request FFmpeg/FFmpeg/23742
(node:13766) [DEP0040] DeprecationWarning: The `punycode` module is deprecated. Please use a userland alternative instead.
(Use `node --trace-deprecation ...` to show where the warning was created)
(node:13766) [DEP0169] DeprecationWarning: `url.parse()` behavior is not standardized and prone to errors that have security implications. Use the WHATWG URL API instead. CVEs are not issued for `url.parse()` vulnerabilities.
[DEBUG] cherry-pick the merged commit(s)
[DEBUG] [release/7.0] Cloning repo..
[INFO ] [release/7.0] Cloning repository https://code.ffmpeg.org/FFmpeg/FFmpeg.git to /tmp/test2
[DEBUG] [release/7.0] Creating local branch..
[INFO ] [release/7.0] Creating branch bp-release/7.0-e1ef95c-7309ad9-19e81f9-fea3f13-26a9f9b-1307db3-a633df5
[DEBUG] [release/7.0] Fetching pull request remote..
[INFO ] [release/7.0] Fetching origin pull/23742/head:pr/23742
[DEBUG] [release/7.0] Cherry picking commits..
[INFO ] [release/7.0] Cherry picking e1ef95c779a3757d21ab970c06aac3e9e1b71974
[DEBUG] [release/7.0] Cherry picking command git cherry-pick,-m,1,--strategy=recursive,--strategy-option=theirs,e1ef95c779a3757d21ab970c06aac3e9e1b71974
[INFO ] [release/7.0] Cherry picking 7309ad9fd78d875e60427daa52260834e27ef2ea
[DEBUG] [release/7.0] Cherry picking command git cherry-pick,-m,1,--strategy=recursive,--strategy-option=theirs,7309ad9fd78d875e60427daa52260834e27ef2ea
[INFO ] [release/7.0] Cherry picking 19e81f9260e64c43604556cbd4079fadee4ac4f1
[DEBUG] [release/7.0] Cherry picking command git cherry-pick,-m,1,--strategy=recursive,--strategy-option=theirs,19e81f9260e64c43604556cbd4079fadee4ac4f1
[INFO ] [release/7.0] Cherry picking fea3f13a1cc5395b0ab6db95dd20e7cf6023c311
[DEBUG] [release/7.0] Cherry picking command git cherry-pick,-m,1,--strategy=recursive,--strategy-option=theirs,fea3f13a1cc5395b0ab6db95dd20e7cf6023c311
[INFO ] [release/7.0] Cherry picking 26a9f9b3aeb054901b69518223af0d6f4f991fd9
[DEBUG] [release/7.0] Cherry picking command git cherry-pick,-m,1,--strategy=recursive,--strategy-option=theirs,26a9f9b3aeb054901b69518223af0d6f4f991fd9
[INFO ] [release/7.0] Cherry picking 1307db3d3c95223b1d2164844e0542cddbb2a401
[DEBUG] [release/7.0] Cherry picking command git cherry-pick,-m,1,--strategy=recursive,--strategy-option=theirs,1307db3d3c95223b1d2164844e0542cddbb2a401
[INFO ] [release/7.0] Cherry picking a633df56a455ffb75cd97af784cb1f2d2ec2bca9
[DEBUG] [release/7.0] Cherry picking command git cherry-pick,-m,1,--strategy=recursive,--strategy-option=theirs,a633df56a455ffb75cd97af784cb1f2d2ec2bca9
[WARN ] [release/7.0] Pull request creation and remote push skipped
[INFO ] [release/7.0] {
  "owner": "FFmpeg",
  "repo": "FFmpeg",
  "head": "bp-release/7.0-e1ef95c-7309ad9-19e81f9-fea3f13-26a9f9b-1307db3-a633df5",
  "base": "release/7.0",
  "title": "[release/7.0] Fix d3d12va bitstream size checking",
  "body": "**Backport:** https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23742\r\n\r\nD3D12VA fully trusts the return value of ff_d3d12va_get_suitable_max_bitstream_size(), which just returns av_image_get_buffer_size(frames_ctx->sw_format, avctx->coded_width, avctx->coded_height, 1).\r\nNo size checking was done.\r\nSo a file specifically crafted to bust that limit is able to overflow that buffer.\r\nAt least I wasn't able to find anysize checking done anywhere, so this is what this series adds.\r\n\r\nThis was originally found by depthfirst, but only the instance the first commit fixes.\r\nWhen I looked into it more, I found the same issue in all other d3d12va decoders, as well as the other instance inside of the AV1one.",
  "reviewers": [
    "BtbN"
  ],
  "assignees": [],
  "labels": [],
  "comments": []
}
[INFO ] Process succeeded

Checklist

• Tests added if applicable.
• Documentation updated if applicable.

Merge criteria:

• The commits and have meaningful messages; the author will squash them after approval or will ask to merge with squash.
• Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
• The developer has manually tested the changes and verified that the changes work

Note: dist/cli/index.js and dist/gha/index.js are automatically generated by git hooks and gh workflows.

First time here?

This project follows git conventional commits pattern, therefore the commits should have the following format:

<type>(<optional scope>): <subject>
empty separator line
<optional body>
empty separator line
<optional footer>

Where the type must be one of [build, chore, ci, docs, feat, fix, perf, refactor, revert, style, test]

NOTE: if you are still in a work in progress branch and you want to push your changes remotely, consider adding --no-verify for both commit and push, e.g., git push origin <feat-branch> --no-verify - this could become useful to push changes where there are still tests failures. Once the pull request is ready, please amend the commit and force-push it to keep following the adopted git commit standard.

How to prepare for a new release?

There is no need to manually update package.json version and CHANGELOG.md information. This process has been automated in Prepare Release Github workflow.

Therefore whenever enough changes are merged into the main branch, one of the maintainers will trigger this workflow that will automatically update version and changelog based on the commits on the git tree.

More details can be found in package release section of the README.

[github-actions]

Coverage report

St.❔	Category	Percentage	Covered / Total
🟢	Statements	89.77% (+0.22% 🔼)	588/655
🟢	Branches	85.8% (+0.8% 🔼)	284/331
🟢	Functions	87.97% (+0.31% 🔼)	139/158
🟢	Lines	89.57% (+0.2% 🔼)	567/633

Test suite run success

222 tests passing in 19 suites.

Report generated by 🧪jest coverage report action from 64ad7ce