From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id B67911FF13A for ; Wed, 08 Jul 2026 11:57:58 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id C46C721445; Wed, 08 Jul 2026 11:57:57 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Subject: [PATCH pve-kernel] scripts: make rebase interactive Date: Wed, 8 Jul 2026 11:55:46 +0200 Message-ID: <20260708095722.339465-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1783504635442 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.044 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: BATQ72VLDGYTEPU7DH3PWYWVQ26VUSXR X-Message-ID-Hash: BATQ72VLDGYTEPU7DH3PWYWVQ26VUSXR X-MailFrom: f.gruenbichler@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: the rebase will often pick up stray commits that are not part of our patch set, requiring manual intervention. making it interactive allows for quick reviewing/adapting of the patch set. Signed-off-by: Fabian Grünbichler --- this has annoyed me quite a few times, and I had this as local diff temporarily alternatively we could calculate the number of patches and rebase only a range, but one of the failure scenarios is patches we have in our patch set no longer being applicable, but not being auto-dropped either, which that would not solve.. debian/scripts/import-upstream-tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/scripts/import-upstream-tag b/debian/scripts/import-upstream-tag index 6863595..6c86b99 100755 --- a/debian/scripts/import-upstream-tag +++ b/debian/scripts/import-upstream-tag @@ -92,7 +92,7 @@ if [[ -n "$rebase" ]]; then ## rebase patches echo "" echo "rebasing patchqueue on top of '${new_tag}'" - git rebase "${new_tag}" + git rebase --interactive "${new_tag}" cd "${top}" ## regenerate exported patch queue -- 2.47.3