Unverified Commit 3f2f8cef authored by Matt Sturgeon's avatar Matt Sturgeon Committed by GitHub
Browse files

auto-rebase: add -f to the filter-branch invocation (#432514)

parents ecb3ef38 b5f59f80

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