From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 07 Dec 2023 12:10:20 +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 1rBCGp-006uFH-2g for lore@lore.pengutronix.de; Thu, 07 Dec 2023 12:10:20 +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 1rBCGq-0003Bs-73; Thu, 07 Dec 2023 12:10:20 +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 1rBCGQ-0002qI-9k; Thu, 07 Dec 2023 12:09:54 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.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 1rBCGP-00EAVm-Th; Thu, 07 Dec 2023 12:09:53 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rBCGP-005Zej-2q; Thu, 07 Dec 2023 12:09:53 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Thu, 7 Dec 2023 12:09:53 +0100 Message-Id: <20231207110953.1328694-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231129093743.906378-4-u.kleine-koenig@pengutronix.de> References: <20231129093743.906378-4-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] 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: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= 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 Thanks, applied as 5b1b2174fcad766c495d8bbbd5b2216cafe4fa64. Michael [sent from post-receive hook] On Thu, 07 Dec 2023 12:09:53 +0100, Uwe Kleine-König wrote: > 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 > Message-Id: <20231129093743.906378-4-u.kleine-koenig@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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