Skip to content

[29.x backport] scripts/sync-branch: Fix non-interactive merge #7099

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
thaJeztah merged 1 commit into from
Jul 10, 2026
+4 −2
Merged

[29.x backport] scripts/sync-branch: Fix non-interactive merge #7099

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
6 changes: 4 additions & 2 deletions scripts/sync-branch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fi
tags_to_sync=("$@")

for tag_to_sync in "${tags_to_sync[@]}"; do
if git merge --no-ff "$tag_to_sync"; then
if git merge --no-edit --no-ff "$tag_to_sync"; then
continue
fi

Expand All @@ -20,7 +20,9 @@ for tag_to_sync in "${tags_to_sync[@]}"; do

git checkout "$tag_to_sync" -- '.'
git add --all
git merge --continue

# Can't use --no-edit with --continue
EDITOR=true git merge --continue
done

# Check that every tag is in the branch.
Expand Down