Renovate ignores Git fixup commits

[sthdev]

How are you running Renovate?

Self-hosted Renovate

If you're self-hosting Renovate, tell us which platform (GitHub, GitLab, etc) and which version of Renovate.

GitHub, Renovate 39

Please tell us more about your question or problem

Sometimes, PRs created by Renovate need to be manually extended. Normally, Renovate detects additional commits created by other users and does not rebase the PR.

However, we sometimes use the Git fixup method (see e.g. https://mikulskibartosz.name/git-fixup-explained) to extend commits created by Renovate. Using this method results in a single commit in the PR, which is authored by renovate as well as the user that extended it.

In this case, Renovate does not detect that the PR was manually modified. Therefore, when Renovate runs the next time, it rebases the PR and throws away the extended commit. We can work around this problem by adding the stop-updating label to the PR. However, people have to think about this.

Is it possible to change the way how Renovate decides if a PR needs rebasing so that it is only rebased if Renovate is the sole author of the commits in the PR?

Logs (if relevant)

Logs

Replace this text with your logs, between the starting and ending triple backticks

[viceice]

Renovate only checks the commit author and it's probably not easily doable / desired to check the committer

renovate/lib/util/git/index.ts

Line 674 in 1d64a10

committedAuthors.add(commit.author_email);

[rarkins]

@sthdev can you create a reproduction? One that:

• Has a Renovate PR created
• You create a fixup commit just like you have described
• Stop (before Renovate overwrites it)

I'd like to look at what this PR/commit history looks like

[github-actions[bot]]

Hi there,

Get your discussion fixed faster by creating a minimal reproduction. This means a repository dedicated to reproducing this issue with the minimal dependencies and config possible.

Before we start working on your issue we need to know exactly what's causing the current behavior. A minimal reproduction helps us with this. Discussions without reproductions are less likely to be converted to Issues.

Please follow these steps:

1. Read our guide on creating a minimal reproduction.
2. Go to our minimal reproduction template repository.
3. Select the Use this template button to create a new repository based on the template.
4. Work on the minimal reproduction in your own repository.
5. Fill out the information in your repository's README.md.
6. Add the link to your reproduction to the first post of your Discussion. If you are not the original author, you can post a new comment with the link.

If you need help with running renovate on your minimal reproduction repository, please refer to our Running Renovate guide.
Good luck,

The Renovate team