| Message ID | 20260501110040.1874719-23-sjg@u-boot.org |
|---|---|
| State | New |
| Headers |
Return-Path: <concept-bounces+u-boot-concept=u-boot.org@u-boot.org> X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1777633330; bh=/afbTpyi6knU1drB9Fked3uupCwo+IvjATr1G/E0tVg=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=eYZDD7IYfvSNcmEYNzBtr0HndiATiO8//7RTrR4oIktk4CgfIngTiVki7XIS9Uhcs um4XyYPyDBMJa91oqC8gcG1IJxeya1+bEQP6VOtyUD13mGStomDQyBfaL3ibc2tAr6 HHNyzdbf1F3K0Xl6LNv0OwYuKRNmJlqcEVthoQIw= Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 15C896A848 for <u-boot-concept@u-boot.org>; Fri, 1 May 2026 05:02:10 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id rTPIvGINK09L for <u-boot-concept@u-boot.org>; Fri, 1 May 2026 05:02:10 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1777633330; bh=/afbTpyi6knU1drB9Fked3uupCwo+IvjATr1G/E0tVg=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=eYZDD7IYfvSNcmEYNzBtr0HndiATiO8//7RTrR4oIktk4CgfIngTiVki7XIS9Uhcs um4XyYPyDBMJa91oqC8gcG1IJxeya1+bEQP6VOtyUD13mGStomDQyBfaL3ibc2tAr6 HHNyzdbf1F3K0Xl6LNv0OwYuKRNmJlqcEVthoQIw= Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 03AC16A833 for <u-boot-concept@u-boot.org>; Fri, 1 May 2026 05:02:10 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1777633326; bh=E1YvVl12W+VX/MjBVlqRlDSE+WKg0WEMgBLPKTcnX1g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L0109zpIvCpna6zef8kOCHUfD2F1aSzxd0eH7eljo7p34rfr84jIf1A3AVubk9/LX LISJoX46MPomECmnbwOes8wkqq0NFHxP7feujN3eyyaN+9/Hn+Yzhq7pWk0I54kPR4 uSkyxUjc2falVNidPJcHMl4qf1ZWLM8wd7KTk4gU= Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id AD1E16A837; Fri, 1 May 2026 05:02:06 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id ue4VZUbRDEYu; Fri, 1 May 2026 05:02:06 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1777633319; bh=+qNDXojS4qWuTki6Y8NPQqnkLnpLZJUh70aG5Ai2hZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RfRekTynIAMONdaEHjy3P3F2zzRWp4N0UCqACYSzamO+JQfQ1KT3KqjFpn7ZfN8ka bVguR8mT8R0ORzSid3wJFGsiY0iAw+tFI8yhVFIKY8NjJByAK0e7uK54MgE7Cg6c0y i8Uih6HCoX53na6bLYGz+GZjckC2uKxLTC0jn020= Received: from u-boot.org (unknown [174.51.25.52]) by mail.u-boot.org (Postfix) with ESMTPSA id 4F0B66A7AF; Fri, 1 May 2026 05:01:59 -0600 (MDT) From: Simon Glass <sjg@u-boot.org> To: U-Boot Concept <concept@u-boot.org> Date: Fri, 1 May 2026 05:00:14 -0600 Message-ID: <20260501110040.1874719-23-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260501110040.1874719-1-sjg@u-boot.org> References: <20260501110040.1874719-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: 6ODBS5NP522UNH2GLEBNCJDJMY6CEUID X-Message-ID-Hash: 6ODBS5NP522UNH2GLEBNCJDJMY6CEUID X-MailFrom: sjg@u-boot.org 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 CC: Simon Glass <sjg@chromium.org> X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 22/29] patman: Stash untracked files before reviewing List-Id: Discussion and patches related to U-Boot Concept <concept.u-boot.org> Archived-At: <https://lists.u-boot.org/archives/list/concept@u-boot.org/message/6ODBS5NP522UNH2GLEBNCJDJMY6CEUID/> List-Archive: <https://lists.u-boot.org/archives/list/concept@u-boot.org/> List-Help: <mailto:concept-request@u-boot.org?subject=help> List-Owner: <mailto:concept-owner@u-boot.org> List-Post: <mailto:concept@u-boot.org> List-Subscribe: <mailto:concept-join@u-boot.org> List-Unsubscribe: <mailto:concept-leave@u-boot.org> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit |
| Series |
patman: Review-flow improvements and shared helpers
|
|
Commit Message
Simon Glass
May 1, 2026, 11 a.m. UTC
From: Simon Glass <sjg@chromium.org> When starting a review, 'git stash' does not include untracked files by default. If the current branch has build artefacts or other untracked files (e.g. rust files present on ci/master), those files remain in the working tree when the review branch is checked out and get picked up by the review process. Pass include_untracked=True to gitutil.stash_save() so untracked files are also stashed, and restored on 'git stash pop' when the review finishes. Signed-off-by: Simon Glass <sjg@chromium.org> --- tools/patman/review.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tools/patman/review.py b/tools/patman/review.py index 056333b5fe3..0508b01e5ec 100644 --- a/tools/patman/review.py +++ b/tools/patman/review.py @@ -1944,7 +1944,10 @@ def do_review(args, pwork, cser): ctx.repo_path = gitutil.get_top_level() orig_branch = gitutil.current_branch(ctx.repo_path) try: - stash_out = gitutil.stash_save(ctx.repo_path) + # Stash untracked files too, so build artefacts from the + # current branch don't leak into the review branch + stash_out = gitutil.stash_save(ctx.repo_path, + include_untracked=True) if 'No local changes' not in stash_out: had_stash = True except command.CommandExc: