gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto-rebase: add -f to the filter-branch invocation

Browse Source 
...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
This commit is contained in:
Maximilian Bosch
2025-08-10 14:24:34 +02:00
parent dfe6a41c36
commit b5f59f805b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/scripts/auto-rebase/run.sh
+1 -1
View File
@@ -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