From b5f59f805bdab8d74c1a5ec0b9f06e740e6981d2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 10 Aug 2025 14:24:34 +0200 Subject: [PATCH] auto-rebase: add -f to the filter-branch invocation ...because it tells me to do so: + git filter-branch --parent-filter 'sed '\''s/2140bf39e41767f25a395d20fb0d5698b8934b33/374e6bcc403e02a35e07b650463c01a52b13a7c8/'\''' --tree-filter 'nix-shell --run treefmt' 374e6bcc403e02a35e07b650463c01a52b13a7c8..HEAD Cannot create a new backup. A previous backup already exists in refs/original/ Force overwriting the backup with -f --- maintainers/scripts/auto-rebase/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/auto-rebase/run.sh b/maintainers/scripts/auto-rebase/run.sh index 1a8ad98c3723..65b7a9d16fb3 100755 --- a/maintainers/scripts/auto-rebase/run.sh +++ b/maintainers/scripts/auto-rebase/run.sh @@ -45,7 +45,7 @@ for line in "${autoLines[@]}"; do # commit is unchanged. This is why the following is also necessary: # - The tree filter runs the command on each of our own commits, # effectively reapplying it. - FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch \ + FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch -f \ --parent-filter "sed 's/$parent/$autoCommit/'" \ --tree-filter "$autoCmd" \ "$autoCommit"..HEAD