From f57e5284570c6b734442c18101756d672486a970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Thu, 9 Jul 2026 16:47:11 +0200 Subject: [PATCH] scripts/sync-branch: Fix non-interactive merge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- scripts/sync-branch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/sync-branch b/scripts/sync-branch index 4da920c10b3c..ed24e507ffcc 100755 --- a/scripts/sync-branch +++ b/scripts/sync-branch @@ -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 @@ -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.