[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Consistent patch style



Hi

I would like to +1 for git formatted patches, but I'm happy to configure my git client however we want.

//Alex


On Fri, Sep 6, 2024, 00:10 Blair Noctis <ncts@debian.org> wrote:
On 06/09/2024 04:22, Jeremy Bícha wrote:
> Everything else in Debian I touch uses git formatted patches.
>
> Instead of quilt directly, I frequently use git-buildpackage's pq commands.
>
> https://manpages.debian.org/unstable/gbp-q
>
> For a rust package, it's a few extra steps compared to whatever you do
> on quilt, but quilt isn't reliable for me.
>
> I end up running git init; git add -a; git commit -m "Init"
> then I run gbp pq import
> to get into a git tree with patches applied as git commits.
> Make whatever changes I need as git commits.
> Then gbp pq export to unapply the patches and return to the branch I
> was working on. The patches are staged where they are supposed to be
> and listed in debian/patches/series like expected.


Indeed, it feels better to work on patches in the form of git commits. Though
I'm not sure if this applies to our patches-in-monorepo construct.

Oh and, I forgot to mention the actual point 4:

4. original and new file prefix

        --- foo.orig/bar
        +++ foo/bar

vs

        --- a/bar
        +++ b/bar

--
Sdrager,
Blair Noctis

Reply to: