Le 09/07/2025 à 16:13, Alexandros Kosiaris a écrit :
For what it's worth, I 've been dealing with this consequence for the largest part of the last 12 years, since operations/puppet has been a rebase heavy repo for a very long time. Although this has been an explicit choice (with some back, forths and improvements over time), this is largely due to the nature of a Puppet codebase, given every change carries state. Overall, it's not as bad as it might appear. For the review/<thing> branch, you can do a git review -d to refresh them before deleting them, and overall a GC every once in a while where -D is used instead of -d fixes the issue. It's rare that you lose something, cause we all push to gerrit often enough.
Hi Alexandros and Lucas,
The discussion about deleting local review branches that have been merged eventually has led me to implement a solution in git-review. I am using `git cherry` which compares the diff rather than the sha1. So if a change get rebased, the resulting commit will be detected has having been applied.
I have send the patch upstream https://review.opendev.org/c/opendev/git-review/+/955094:
List the status of local reviews branches: git-review --list-local
Test deletion: git-review --clean-local --dry-run
Delete them! git-review --clean-local
I could use some feedback on their Gerrit, here by email or on IRC :)
Antoine "hashar" Musso Wikimedia - Release Engineering