From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kKd2a-0006cW-GA for ptxdist@pengutronix.de; Tue, 22 Sep 2020 09:48:44 +0200 Received: from mol by dude02.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1kKd2a-0002Rm-6m for ptxdist@pengutronix.de; Tue, 22 Sep 2020 09:48:44 +0200 Date: Tue, 22 Sep 2020 09:48:44 +0200 From: Michael Olbrich Message-ID: <20200922074844.GB11021@pengutronix.de> References: <20200918131002.9838-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200918131002.9838-1-u.kleine-koenig@pengutronix.de> Subject: Re: [ptxdist] [PATCH] git-ptx-patches: support flag -n to get unnumbered patches List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de On Fri, Sep 18, 2020 at 03:10:02PM +0200, Uwe Kleine-K=F6nig wrote: > When passing -n to git-ptx-patches the filenames in the patch stack > don't get a number as prefix. > = > The obvious downside is that the order of the patches isn't obvious > without the series file and you cannot create a patch stack if two > patches share have the same shortlog (which ideally shouldn't happen > ...) > = > The obvious advantage is that when a patch is added or removed in the > middle of the series there are no renames for the later patches > necessary and the changes to series are smaller accordingly. > = > So if the patchstack of openssl used unnumbered patches the commit > c45d66cdae4b ("openssl: remove engines-path patch") would only have to > touch two lines in series (i.e. the removal of the patch and the changed > checksum) and contain no renames. Hmmm, I prefer numbers for upstream, but if someone want's patches like this in a BSP, then I don't mind. However, this patch does not apply on master. Please rebase. Michael > Signed-off-by: Uwe Kleine-K=F6nig > --- > scripts/git-ptx-patches | 17 +++++++++++++++-- > 1 file changed, 15 insertions(+), 2 deletions(-) > = > diff --git a/scripts/git-ptx-patches b/scripts/git-ptx-patches > index 721aa78ba31c..b2bed9664fca 100755 > --- a/scripts/git-ptx-patches > +++ b/scripts/git-ptx-patches > @@ -19,6 +19,7 @@ fi > = > remove_old=3Dno > tag=3Dbase > +numbered_patches=3Dtrue > = > if grep -q "$PTX_PATCHES_HEADER" .ptxdist/series; then > echo "Found series file generated by git-ptx-patches." > @@ -37,7 +38,7 @@ if [ "x$1" =3D "x--force-remove" ]; then > shift > fi > = > -while getopts "ft:n:" opt; do > +while getopts "ft:n" opt; do > case "${opt}" in > f) > remove_old=3D"force" > @@ -46,6 +47,9 @@ while getopts "ft:n:" opt; do > tag=3D"${OPTARG}" > range=3D"${tag}" > ;; > + n) > + numbered_patches=3Dfalse > + ;; > esac > done > shift $((${OPTIND} - 1)) > @@ -129,7 +133,16 @@ fi > GIT_EXTRA_ARGS=3D"$GIT_EXTRA_ARGS --summary --stat=3D80" > = > cat .ptxdist/series.0 > .ptxdist/series > -git format-patch -N $GIT_EXTRA_ARGS ${tagopt} -o .ptxdist/patches/ ${ran= ge} | sed -e 's,^.ptxdist/patches/,,' > .ptxdist/series.auto > +git format-patch -N $GIT_EXTRA_ARGS ${tagopt} -o .ptxdist/patches/ ${ran= ge} | while read patch; do > + if "$numbered_patches"; then > + patchname=3D"${patch#.ptxdist/patches/}" > + else > + patchname=3D"${patch#.ptxdist/patches/[0-9][0-9][0-9][0-9]-}" > + mv -n "$patch" ".ptxdist/patches/$patchname" > + fi > + echo "$patchname" > +done > .ptxdist/series.auto > + > cat .ptxdist/series.auto >> .ptxdist/series > cat .ptxdist/series.1 >> .ptxdist/series > cat .ptxdist/series | _md5sum >> .ptxdist/series > -- = > 2.27.0 > = > = > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request= @pengutronix.de -- = Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@p= engutronix.de