From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek =?utf-8?Q?Marczykowski-G=C3=B3recki?= Subject: Re: offtopic: handling patches Date: Sun, 2 Jul 2017 11:24:28 +0200 Message-ID: <20170702092428.GP1095@mail-itl> References: <20170630165701.GC3828@mail-itl> <850278fd-5198-cb99-bc3f-50019645071c@citrix.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6395772940358518014==" Return-path: In-Reply-To: <850278fd-5198-cb99-bc3f-50019645071c@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Andrew Cooper Cc: xen-devel List-Id: xen-devel@lists.xenproject.org --===============6395772940358518014== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="aYrjF+tKt+ApYAdb" Content-Disposition: inline --aYrjF+tKt+ApYAdb Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jun 30, 2017 at 06:18:11PM +0100, Andrew Cooper wrote: > On 30/06/17 17:57, Marek Marczykowski-G=C3=B3recki wrote: > > Hi, > > > > How you guys handle patches with emails? I know git am and git > > format-patch/send-email, but those tools are quite limited, especially > > when handling patch series, subsequent versions etc. > > What I miss there: > > - patch versioning (git notes could be used, but it doesn't survive git > > commit --amend, nor git rebase) > > - keeping/versioning cover email > > - collecting Cc: from all patches in series into cover email > > - adding Reviewed-by, Acked-by etc tags > > > > I can't believe you all do this all manually ;) > > Is there any commonly available tool I can't find, or everyone have own > > scripts? >=20 > Manually, I'm afraid. I've never found anything more automatic which wor= ks. >=20 > My general workflow is a single git branch which is always rebased onto > staging. >=20 > Patch version information lives in the commit message under a --- line, This is excellent idea! I don't know why never thought of it... > and I am frequent user of `git commit --fixup/--squash` and `git rebase > --interactive`. Me too :) > I've a separate directory tree where I format patch series including > cover letters, before using `git send-email --dry-run *.patch` to send > them. These get recycled in a lazy fashon, typically once the series > has been committed, but the old cover letters generally available in an > adjacent directory when sending a newer series. I've found git-series[1] tool. From the above list it allow you to diff between series versions, and more importantly - keep cover letter in git! > For collecting and reviewing tags, look at the PatchWork `pwclient` > utility. Its `git-am` mode automagically collects tags, which is > fantastically useful for applying a patch for committing. (Then again, > I do always manually check the conversation on list before actually > committing the series.) Thanks, indeed looks interesting. BTW is this[2] the right instance? It doesn't looks to notice applied patches. [1] https://github.com/git-series/git-series [2] https://patchwork.kernel.org/project/xen-devel/list --=20 Best Regards, Marek Marczykowski-G=C3=B3recki Invisible Things Lab A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? --aYrjF+tKt+ApYAdb Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJZWLvMAAoJENuP0xzK19csQtsIAJmYaddj9y0VnPBiFbNfBb7z 2luNF/gjR0jkdvFXXtel7fJgigqxnEMq6eFKFrvvN5zBBoqygvz2FWZbClLwwzv3 O+h6ziqhoOTk/LWNB620u9T+L4bf441QbqZRqvYYPDyqalzjPg+NcXQHZ6ftKvjO EO6fEIS9n8Rq3ZdkPXYClVnK8sQGhCW/LHFur8afQg1r+qfDBNuOw7seqR1bisGV 9LS6SwAaTV//XDJQcPFYuwRPQnNuJjjhc2vAi5cA+KjFnioKYPYIP5axn/NCpVQg LDc5SBdg6bo8kRmG4TuwW+l28PyStNtpF0Phyo4fBGxt6jZpZWtWjtUwaTiPHW0= =c8Wy -----END PGP SIGNATURE----- --aYrjF+tKt+ApYAdb-- --===============6395772940358518014== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVs IG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5v cmcveGVuLWRldmVsCg== --===============6395772940358518014==--