If I understood it correctly, exiting with code 78 should be a "good exit", but it seems that the action is failing because of it for us:

https://github.com/prisma/specs/runs/218985421

 Automatic Rebase1s
##[error]Docker run failed with exit code 78
Run cirrus-actions/[email protected]
/usr/bin/docker run --name df7dc7c49eb902bfe42fcb67faca5311c2217_a47a2b --label 0df7dc --workdir /github/workspace --rm -e GITHUB_TOKEN -e HOME -e GITHUB_REF -e GITHUB_SHA -e GITHUB_REPOSITORY -e GITHUB_ACTOR -e GITHUB_WORKFLOW -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e GITHUB_EVENT_NAME -e GITHUB_WORKSPACE -e GITHUB_ACTION -e GITHUB_EVENT_PATH -e RUNNER_OS -e RUNNER_TOOL_CACHE -e RUNNER_TEMP -e RUNNER_WORKSPACE -v "/var/run/docker.sock":"/var/run/docker.sock" -v "/home/runner/work/_temp/_github_home":"/github/home" -v "/home/runner/work/_temp/_github_workflow":"/github/workflow" -v "/home/runner/work/specs/specs":"/github/workspace" 0df7dc:7c49eb902bfe42fcb67faca5311c2217
Checking if contains '/rebase' command...
##[error]Docker run failed with exit code 78

Am I doing something wrong here?

(Configured via copy/paste of example to https://github.com/prisma/specs/blob/master/.github/workflows/rebase.yml)

do any of you understand the reason for this:

GitHub Actions has encountered an internal error when running your job.

on https://github.com/apache/fineract/actions/runs/105935715 ? Where do you see that "internal error"?

I'm maintainer of that project, and had added rebase to it.

Hello
I tried to set this thing up but however I've put it it didn't fire the workflow after the pull request was rebased.

I have created a very simple repo demonstrating the issue. Branch master is protected and it needs to be up to date before merging. In the sample there is a master and a feature branch.

* 86bd7db (HEAD -> master, origin/master) third master
| * 4c8948b (origin/feature-1, feature-1) feature first
|/
* 001c1ee second master
* b688c44 first commit

the repo is https://github.com/jurenovic/test-rebase

Can you please help me since I would really like having rebasing feature from PR comments.

Many thanks

Are https://github.com/cirrus-actions/rebase#limitations still valid as GitHub Actions have been in public beta for while now?

We use GitHub's git lfs and currently the "Automatic Rebase" step fails

Previous HEAD position was XXXXX add /rebase command
Branch 'XXXXXXXX' set up to track remote branch 'XXXXX' from 'origin'.
Switched to a new branch 'XXXXXXXX'
\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-checkout.\n

Can take a crack at this if you think it's possible to solve.

Envíe 1 BTC a la dirección de Bitcoin 1FRQ9dPbZMpZo8YyXzMbPhUTQwQhMkYdR .

bitcoin://1FRQ9dPbZMpZo8YyXzMbPhUTQwQhMkYdR?amount=1

our developers are quite happily using this feature (and are loving it!) but i noticed that this action is never executed in parallel. is there a way in the action api to enable that?

Following up on #12: (@drdanz @fkorotkov @sobolevn @ljharb @gep13 perhaps this interests you)

I'm a bit puzzled about why /rebase works for us e.g. on apache/fineract#769 (see the Action's run here) but failed e.g. for apache/fineract#825 (see here and here failing due to "error: failed to push some refs").

Should pass the action when PR is not rebaseable.

Issue opened to quickly.

Hi!

I got an error automatic rabase.

From https://github.com/XXXX/YYYY
 * branch            master     -> FETCH_HEAD
+ git fetch origin new-pipeline
From https://github.com/XXXX/YYYY
 * branch            new-pipeline -> FETCH_HEAD
 * [new branch]      new-pipeline -> origin/new-pipeline
+ git checkout -b new-pipeline origin/new-pipeline
Branch 'new-pipeline' set up to track remote branch 'new-pipeline' from 'origin'.
Switched to a new branch 'new-pipeline'
+ git rebase origin/master
First, rewinding head to replay your work on top of it...
Applying: init
.git/rebase-apply/patch:10: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in README.md
Auto-merging README.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 init
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
##[error]Docker run failed with exit code 1

I'm sorry, I have no idea how to fix it.
but i think this branch(new-pipeline) is no changed README.md.
I don't know why this error..

I used google.
https://stackoverflow.com/questions/24412980/how-to-run-git-rebase-and-ignore-whitespace

git rebase -Xignore-space-change master

Can used?

We use merges once code review has started to avoid churning reviews. What would you think of an option to specify merging the base branch?

Thank you for developing this.

Since I found the official feature is released, I'll let you know.
https://github.blog/changelog/2022-02-03-more-ways-to-keep-your-pull-request-branch-up-to-date/

Here's what I'm getting:

Current runner version: '2.163.1'
Prepare workflow directory
Prepare all required actions
Download action repository 'actions/checkout@master'
Download action repository 'cirrus-actions/[email protected]'
##[warning]Failed to download action 'https://api.github.com/repos/cirrus-actions/rebase/tarball/v1.2.0'. Error Response status code does not indicate success: 404 (Not Found).
##[warning]Back off 23.846999999999998 seconds before retry.
##[warning]Failed to download action 'https://api.github.com/repos/cirrus-actions/rebase/tarball/v1.2.0'. Error Response status code does not indicate success: 404 (Not Found).
##[warning]Back off 29.116 seconds before retry.
##[error]Response status code does not indicate success: 404 (Not Found).

/entrypoint.sh: line 83: 94dreamer_TOKEN: invalid variable name

Hi,

The actions/checkout action allows specifying a relative path.

But, by doing so the rebase fails and we get this error : fatal: not a git repository (or any parent up to mount point /github)

Is there a workaround? (I tried to add a step cd some/custom/path before rebasing but I got the same error)

Here is the workflow file :

name: Automatic Rebase
on:
  issue_comment:
    types: [created]
jobs:
  rebase:
    name: Rebase
    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
    runs-on: ubuntu-latest
    steps:
      - name: Checkout the latest code
        uses: actions/checkout@v2
        with:
          path: some/custom/path
          token: ${{ secrets.GITHUB_TOKEN }}
          fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
      - name: Automatic Rebase
        uses: cirrus-actions/[email protected]
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Thanks!

Hi, thanks for building this tool!

I am trying to integrate in to my workflow, but something is not working well: sobolevn/itmo-2019#11

After a rebase I am left with this:

That's how my build workflow looks like: https://github.com/sobolevn/itmo-2019/blob/master/.github/workflows/build.yml

What's wrong?

If GitHub isn't sure about it (such as if it's requested right when another commit is merged into the base branch), it will return null for these.

"mergeable": null,
"rebaseable": null,

Would be great if it could just retry after a couple seconds

How can I debug rebase action? is not working for me, and I don't see any error anywhere.

I created a test branch, which has the .github/workflows/rebase.yml file, then I created a PR from the test-rebase branch to develop (we don't merge to master directly). After that I write the /rebase command that is not working for me.

I don't really see how to debug it or how can I make it work.

It will be nice to have an option to trigger the action on push events to a branch to rebase all PRs that want to merge into this branch.

To reduce the noise on a PR from a /rebase comment, it might be interesting to let the rebase be triggered by a label. E.g.:

• You add a "needs-rebase" label to the PR
• This triggers the rebase action
• After rebasing, the label is removed by the action

I suspect that this might not actually need any changes to the action itself, just a different workflow configuration (this would require a way to remove a label, but it seems there is an action for that, or it could be done using github-script).

Anyone tried this already?

I'm getting:

Current runner version: '2.163.1'
Prepare workflow directory
Prepare all required actions
Download action repository 'actions/checkout@master'
Download action repository 'cirrus-actions/[email protected]'
##[warning]Failed to download action 'https://api.github.com/repos/cirrus-actions/rebase/tarball/v1.2'. Error Response status code does not indicate success: 404 (Not Found).
##[warning]Back off 28.897 seconds before retry.
##[warning]Failed to download action 'https://api.github.com/repos/cirrus-actions/rebase/tarball/v1.2'. Error Response status code does not indicate success: 404 (Not Found).
##[warning]Back off 13.456999999999999 seconds before retry.
##[error]Response status code does not indicate success: 404 (Not Found).

Help appreciated!

Hello, I have probably a question why the rebase doesn't do anything? I was using the example from readme but still when I type /rebase nothing is happening...
see the repo PR Lightning-AI/pytorch-lightning#1680 (comment)

When using this script as a GitHub Action in one of the project I lead at work, the action is removing the signature associated to a commit when doing a rebase.

In order to merge a PR, we require that all commits are signed so I would like to know if there is a way to:

1. either keep each commit signed
2. or to sign the new commits during the rebase

We can see this issue in the screen recording part of the README.md file of this repository.

I want to use this action on pull request automatically
I want to have a way to disable rebase command checks https://github.com/cirrus-actions/rebase/blob/master/entrypoint.sh#L9-L11
I propose to add the REBASE_ON_COMMENT=true|false variable

I am trying to make this work, but it does not trigger:
atom-community/atom#125

Here is my configuration:
https://github.com/atom-ide-community/atom/blob/master/.github/rebase.yml

I am having this issue when trying to run the action:

Any idea of what could cause that?

When trying to rebase a PR from a fork repository, the action fails with this message:

"PRs from forks are not supported at the moment."

It would be very useful if this was supported.

From the git point of view it shouldn't be very difficult to do, something like this should do the trick (untested, but should work):

 # make sure branches are up-to-date
 git fetch origin $BASE_BRANCH
-git fetch origin $HEAD_BRANCH
+
+git remote add fork https://x-access-token:[email protected]/$HEAD_REPO.git
+git fetch fork $HEAD_BRANCH
 
 # do the rebase
-git checkout -b $HEAD_BRANCH origin/$HEAD_BRANCH
+git checkout -b $HEAD_BRANCH fork/$HEAD_BRANCH
+git rebase origin/$BASE_BRANCH
 
 # push back
-git push --force-with-lease
+git push --force-with-lease fork $HEAD_BRANCH

My only issue is that I don't know if the GITHUB_TOKEN works also on fork repositories

Hi, thanks for this great action! I installed in our repo and ran into an error the first time I tried to use it on this PR ultralytics/yolov5#395

A user is trying to submit a PR from their forked branch master to origin/master:

wants to merge 12 commits into ultralytics:master from topiaruss:master

fatal: A branch named 'master' already exists.

Heyo,

I have the following rebase configuration

name: Rebase Pull Request
on:
  issue_comment:
    types: [created]

jobs:
  rebase:
    name: Rebase
    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') && github.event.comment.author_association == 'MEMBER'
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Repository
        uses: actions/[email protected]
        with:
          token: ${{ secrets.REBASE_TOKEN }}
          fetch-depth: 0
      - name: Automatic Rebase
        uses: cirrus-actions/[email protected]
        env:
          GITHUB_TOKEN: ${{ secrets.REBASE_TOKEN }}

Yet "GitHub doesn't think that the PR is rebaseable!" when I or other organization members attempt to rebase PRs, which are submit from forks.
Did I configure something wrong, that it doesn't work on forks?
The action failure in question can be obtained here: https://github.com/IntellectualSites/PlotSquared/runs/4839797347?check_suite_focus=true
My comment, as an organization member and administrator, here: IntellectualSites/PlotSquared#3452 (comment)

But locally I can do git rebase origin/master just fine:

Successfully rebased and updated refs/heads/my-cool-branch.

AFAICS this action now allows anyone to comment "/rebase" and the PR will be rebased. It would be good if this could be limited to comments written by users with write permissions on the repo or branch (e.g. anyone who could otherwise also push to the the branch). Not sure how you would check this exactly, though (haven't looked at actions docs yet).

I know I can do this manually (or not at all), but it would be a nice to have. I sometimes have a lot of contention for merging a PR, and having a bunch of /rebase comments around can get annoying.

Envíe 1 BTC a la dirección de Bitcoin 1FRQ9dPbZMpZo8YyXzMbPhUTQwQhMkYdR .

bitcoin://1FRQ9dPbZMpZo8YyXzMbPhUTQwQhMkYdR?amount=1

Git rebase has an option called --rebase-merges. This keeps any merge commits that are on the branch to be rebased. Imagine a scenario where a branch is a combination of several other branches, but the authors want to rebase it onto master. In the current situation all the merge commits are lost and a single, linear branch will be created. --rebase-merges allows to keep the original history of that branch, along with all the merge commits, and just rebases it onto the target branch.

Would it be possible to keep the original committer to avoid having "GitHub Actions" as a committer in the log?

the RP after rebase by /rebase command can not trigger test check workflow

The action is pretty wasteful, as in, it checks out the repository and only then checks for the comment containing /rebase.

It would be better if it did the comment check first.

After /rebase is triggered, it would be nice to not have to manually go to "Actions" and click through to the rebase workflow to see how it is doing. When the action is triggered, it would be nice to get some sort of feedback in the PR and if it fails, the error message could be posted as a comment in the PR.

I'm attempting to utilize this action, while minimizing the scope of it's permissions. Currently the action file has

permissions:
  contents: read
  pull-requests: write
  issues: read
  # Enforce other not needed permissions are off
  actions: none
  checks: none
  deployments: none
  packages: none
  repository-projects: none
  security-events: none
  statuses: none

However, this doesn't work the action says This check was skipped

What are the minimum required permissions for this to work?

Currently, a full clone is required for this action to work properly. As we need commits since the last common ancestor only, the current behavior isn't optimal on huge repositories.

So, I propose doing something like this:

1. Check out refs/pull/${{ github.event.issue.number }}/head instead of the default branch with the depth of 1. At the point of checkout, this is the only commit we know for sure we'll need and we can refer to it. Patch:

   Click to expand

   diff --git a/README.md b/README.md
   index c88b62d..a66029c 100644
   --- a/README.md
   +++ b/README.md
   @@ -24,7 +24,8 @@ jobs:
        - name: Checkout the latest code
          uses: actions/checkout@v2
          with:
   -        fetch-depth: 0
   +        fetch-depth: 1
   +        ref: refs/pull/${{ github.event.issue.number }}/head
        - name: Automatic Rebase
          uses: cirrus-actions/[email protected]
          env:
   

2. Fetch the head branch and deepen the history by the number of commits in the PR (see --deepen and --shallow-exclude fetch options). This should fetch all the remaining commits in the head branch, plus the the last common ancestor.

3. Fetch the base branch.

At this point, we should have all the commits we need to rebase the head branch.

I think it would be nice if this rebase action was able to keep review approvals even if the project's settings have "Dismiss stale pull request approvals when new commits are pushed" enabled. The rationale is that a rebase does not change the contents of the PR (unless conflicts need to be resolved, but then this action does not work anyway), so if it was approved before the rebase, the same contents should also be approved afterwards. We do want to re-run CI, however, as the rebase might introduce changes that break the PR's functionality.

It would be nice if git rebase --autosquash was supported so that one could use this action to rebase and get rid of fixup commits.

Also, if this is supported it might be nice to support both regular and autosquash rebases using the same actions, but with different commands. For this to work the /rebase regexp needs to be made configurable for the action.

Process:

1. Have repo
2. Create branch
3. Make edit to a file, commit and push branch (single white space in file a)
4. create PR
5. make commit on master and push. (single white space in file b)
6. Confirm message that branch is behind in PR
7. comment /rebase

Output:

+ git rebase origin/master
First, rewinding head to replay your work on top of it...
Applying: init
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in terraform/services/main.tf
Auto-merging terraform/services/main.tf
CONFLICT (add/add): Merge conflict in terraform/permissions/main.tf
Auto-merging terraform/permissions/main.tf
CONFLICT (add/add): Merge conflict in terraform/infrastructure/main.tf
Auto-merging terraform/infrastructure/main.tf
CONFLICT (add/add): Merge conflict in docker-compose.yml
Auto-merging docker-compose.yml
CONFLICT (add/add): Merge conflict in README.md
Auto-merging README.md
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging .gitignore
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 init
Resolve all conflicts manually, mark them as resolved with

None of the files listed were part of the test. Applying: init indicates it is rebasing from the begining of time?

Running the rebase locally for the PR branch gives the following:

$ git rebase origin/master 
First, rewinding head to replay your work on top of it...
Fast-forwarded tt to origin/master.

as per title, can anyone please help me understand why action is skipped here?
I have never seen it working correctly on this repo

https://github.com/AlexeyAB/darknet/actions/runs/956515006

link to comment that triggered the skipped run: AlexeyAB/darknet#792 (comment)

this is the yml in the repository. Note that I am not interested in CI automatically triggering afterwards, just rebasing to work

name: Automatic Rebase
on:
  issue_comment:
    types: [created]
jobs:
  rebase:
    name: Rebase
    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') && (github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER' || github.event.comment.author_association == 'CONTRIBUTOR')
    runs-on: ubuntu-latest
    steps:
      - name: Checkout the latest code
        uses: actions/checkout@v2
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
          fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
      - name: Automatic Rebase
        uses: cirrus-actions/[email protected]
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Hi @fkorotkov can we create a new release, I'll like to update my current version with the latest master. Thanks

Hi, we are using this action in YOLOv5 to rebase PRs. This is great when it works, but unfortunately most attempts result in errors, even after upgrading to the latest version 1.4. Two example failures are here, and anyone should be able to reproduce/produce these failures by going to any YOLOv5 PR and typing '/rebase' in a message.

Example 1:

https://github.com/ultralytics/yolov5/actions/runs/1358138228 run on PR ultralytics/yolov5#5213

Successfully rebased and updated refs/heads/cfati_work.
+ git push --force-with-lease fork cfati_work
To https://github.com/CristiFati/yolov5.git
 ! [remote rejected] cfati_work -> cfati_work (refusing to allow a GitHub App to create or update workflow `.github/workflows/rebase.yml` without `workflows` permission)
error: failed to push some refs to 'https://github.com/CristiFati/yolov5.git'

Example 2:

https://github.com/ultralytics/yolov5/actions/runs/1358133720 run on PR ultralytics/yolov5#5225

Run cirrus-actions/[email protected]
/usr/bin/docker run --name fa4e144cdbdebf242f4225a18ff9f3f5b7e4a4_d2dba2 --label fa4e14 --workdir /github/workspace --rm -e GITHUB_TOKEN -e HOME -e GITHUB_JOB -e GITHUB_REF -e GITHUB_SHA -e GITHUB_REPOSITORY -e GITHUB_REPOSITORY_OWNER -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RETENTION_DAYS -e GITHUB_RUN_ATTEMPT -e GITHUB_ACTOR -e GITHUB_WORKFLOW -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e GITHUB_EVENT_NAME -e GITHUB_SERVER_URL -e GITHUB_API_URL -e GITHUB_GRAPHQL_URL -e GITHUB_WORKSPACE -e GITHUB_ACTION -e GITHUB_EVENT_PATH -e GITHUB_ACTION_REPOSITORY -e GITHUB_ACTION_REF -e GITHUB_PATH -e GITHUB_ENV -e RUNNER_OS -e RUNNER_NAME -e RUNNER_TOOL_CACHE -e RUNNER_TEMP -e RUNNER_WORKSPACE -e ACTIONS_RUNTIME_URL -e ACTIONS_RUNTIME_TOKEN -e ACTIONS_CACHE_URL -e GITHUB_ACTIONS=true -e CI=true -v "/var/run/docker.sock":"/var/run/docker.sock" -v "/home/runner/work/_temp/_github_home":"/github/home" -v "/home/runner/work/_temp/_github_workflow":"/github/workflow" -v "/home/runner/work/_temp/_runner_file_commands":"/github/file_commands" -v "/home/runner/work/yolov5/yolov5":"/github/workspace" fa4e14:4cdbdebf242f4225a18ff9f3f5b7e4a4
Collecting information about PR #5225 of ultralytics/yolov5...
Base branch for PR #5225 is master
+ git fetch origin master
From https://github.com/ultralytics/yolov5
 * branch            master     -> FETCH_HEAD
+ git fetch fork master
From https://github.com/python-pitfalls/yolov5
 * branch            master     -> FETCH_HEAD
 * [new branch]      master     -> fork/master
+ git checkout -b master fork/master
fatal: A branch named 'master' already exists.

Reproduce

Go to https://github.com/ultralytics/yolov5/pulls and create a new /rebase message on any PR, and then visit action results at https://github.com/ultralytics/yolov5/actions/workflows/rebase.yml

Additional Information

Our rebase.yml is here, and is an exact copy of the official usage example:
https://github.com/ultralytics/yolov5/blob/master/.github/workflows/rebase.yml