From 0bfaddbc8d5dd0e2c6b841ef18a7e9fddbe32a85 Mon Sep 17 00:00:00 2001 From: Hadi El Yakhni Date: Sun, 5 Jul 2026 10:00:50 +0300 Subject: [PATCH] [FIX] git-fw: clear stale commit map on redo `redo` writes `.git/FW_CMAP` but never removes it, so the next `redo` may read the map left by a previous one and not find its commit in it. Remove the file at the start of `redo`. --- runbot_merge/scripts/git-fw | 1 + 1 file changed, 1 insertion(+) diff --git a/runbot_merge/scripts/git-fw b/runbot_merge/scripts/git-fw index d9c03b850..99fc4df71 100755 --- a/runbot_merge/scripts/git-fw +++ b/runbot_merge/scripts/git-fw @@ -147,6 +147,7 @@ def redo(pr: str) -> int: exit(r.returncode) print(".") commits = r.stdout.splitlines(keepends=False) + GIT_DIR.joinpath("FW_CMAP").unlink(missing_ok=True) if cm: # remap commits to forward port to those which got merged commits = [cm[c] for c in commits]