From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 29 Nov 2023 10:38:39 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1r8H1i-00D4y5-1p for lore@lore.pengutronix.de; Wed, 29 Nov 2023 10:38:39 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1r8H1i-0003Zq-TV; Wed, 29 Nov 2023 10:38:38 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1r8H15-0003Ai-Hj; Wed, 29 Nov 2023 10:37:59 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1r8H15-00CNDy-5L; Wed, 29 Nov 2023 10:37:59 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1r8H14-00AkM6-SV; Wed, 29 Nov 2023 10:37:58 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: ptxdist@pengutronix.de Date: Wed, 29 Nov 2023 10:37:47 +0100 Message-ID: <20231129093743.906378-4-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.42.0.586.gbc5204569f7d.dirty In-Reply-To: <20231129093743.906378-1-u.kleine-koenig@pengutronix.de> References: <20231129093743.906378-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Developer-Signature: v=1; a=openpgp-sha256; l=964; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=qw2AjyncUZIkdQyNYenGmN1EjOMTtjxUXXbG1ry50LI=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlZwZqU3EXiVZCyWgNiE/Hor9iVSv2biD+fURQd vYSNjqhdXiJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZWcGagAKCRCPgPtYfRL+ Ttd7B/43TLr7KZFhU8ttog1qF+Kk5cXUNDHtX9wv01DyfzRK5e+TNPaiMo+PfrKynBP4oQAmj8d INmYqxPh3iOqvNe9lrKGTLly1yBlYxrHZaAtsvXnasko2xSbyFkm6kOAlSXvB/Oy6x0cReOWyqq xDqVy75UwJZb1XdyTEiVHy2y55uVYUlvhwxfvWDdtRhMLwFNqUzMfhPKFFsvmrzlu+T8fPs2deQ Vvo/kO9qZD3LLf9vsdsa2fBjJuiVOZzal4gqzA+M1Ih5i0glsICaVjGulaydGR7cyZ60GUiiqFe OCVFLyeUEBI0mgL1nrPX/xlPYAXoS07/SjIJd2s6n9HmRtbK X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH 3/3] git-ptx-patches: Simplify nested if construct X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Thorsten Scherer Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Instead of if A; then ... else if B; then ... else ... fi fi use the more compact if A; then ... elif B; then ... else ... fi Signed-off-by: Uwe Kleine-König --- scripts/git-ptx-patches | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/git-ptx-patches b/scripts/git-ptx-patches index 56e82eb2ee56..b27dbe7905d9 100755 --- a/scripts/git-ptx-patches +++ b/scripts/git-ptx-patches @@ -235,11 +235,9 @@ while read patch para; do if grep -q "$patch" .ptxdist/series.auto; then # ok, this is one of the patches we just touched : + elif grep -q "$patch" .ptxdist/series.{0,1}; then + echo "Base patch \"$patch\"!" else - if grep -q "$patch" .ptxdist/series.{0,1}; then - echo "Base patch \"$patch\"!" - else - echo "Old patch \"$patch\"!" - fi + echo "Old patch \"$patch\"!" fi done | sort -- 2.42.0