Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MattSturgeon merged 1 commit into from
Mar 31, 2026
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion maintainers/scripts/auto-rebase/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \

@MattSturgeon MattSturgeon Mar 31, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Personally I'd prefer to use verbose CLI flags in script sources, as they add additional self-documenting context.

Suggested change
FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch -f \
FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch --force \

--parent-filter "sed 's/$parent/$autoCommit/'" \
--tree-filter "$autoCmd" \
"$autoCommit"..HEAD
Expand Down
Loading