Stacked branches do not retarget when additional branches are introduced after PR creation

[robin-fritz-EL]

Version

0.19.10

Operating System

Windows

Distribution Method

msi (Windows)

Describe the issue

On friday, I created two draft PRs from two stacked branches.
State:
PR 2 - branch-2 -> targetting branch-1
PR 1 - branch-1 -> targetting main

Today, I created another branch that was below those two and added some commits in there and created another draft PR + force pushed the other two.

State now, 3 stacked branches:
PR 2 - branch-2 -> targetting branch-1
PR 1 - branch-1 -> targetting main
PR 3 - branch-3 -> targetting main

The problem is in the last line where I would have expected GitButler to retarget PR1 to branch-3.

How to reproduce (Optional)

• create two stacked branches and PRs for them.
• create another branch below the stack and create a PR for it.
• force push the other stacked branches
• check the PRs on GitHub
  • PR 1 -> main
  • PR 2 -> branch-1
  • PR 3 -> main

Expected behavior (Optional)

• create two stacked branches and PRs for them.
• create another branch below the stack and create a PR for it.
• force push the other stacked branches
• check the PRs on GitHub
  • PR 1 -> branch-3
  • PR 2 -> branch-1
  • PR 3 -> main

Relevant log output (Optional)

[Byron]

Thanks a lot for reporting.

The code that does this is most certainly not able to do this properly yet.
So the next time this gets touched it might be easiest to use the now official GitHub stack PR API. Maybe that makes it more robust as well.
Let me CC @mtsgrd just as a heads-up, under the assumption that this is implemented in the frontend.

[krlvi]

Thanks for reporting this. This was fixed in #13697 and shipped in 0.19.11. The fix specifically retargets existing PRs after inserting a branch lower in a stack.

You were on 0.19.10, so updating should resolve it. I’m closing this as fixed, but let me know if you can still reproduce it on a current version.