Unverified Commit b5f59f80 authored by Maximilian Bosch's avatar Maximilian Bosch
Browse files

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

...because it tells me to do so:

    + git filter-branch --parent-filter 'sed '\''s/2140bf39/374e6bcc/'\''' --tree-filter 'nix-shell --run treefmt' 374e6bcc..HEAD
    Cannot create a new backup.
    A previous backup already exists in refs/original/
    Force overwriting the backup with -f
parent dfe6a41c

maintainers/scripts/auto-rebase/run.sh

+1 −1
Original line number Diff line number Diff line
@@ -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