Sean Whitton [22/Feb 2023 1:28pm -07] wrote: > I think that it's very unfortunate that one of our flagship workflows, > dgit-maint-merge(7), now requires local git configuration, in the form > of 'git config --local dgit.default.quilt-mode single'. > Git configuration is a pain to automate. > > I understand the issues with single-debian-patch, but most packages will > never run into issues, and in any case there's no doubt it's a bug in > dpkg, which can be fixed. > > How about having single-debian-patch imply --quilt=single in the absence > of any other setting or command line argument for the quilt mode? > Then in the docs we would say that it is a good idea to use only the git > configuration value, but that this is another option if you prefer it. > > This is still better than the previous situation because dgit will undo > some problems created by single-debian-patch (right?).
Things have improved since then. In particular, we now think that dgit should honour git-debpush's quilt modes stored in Git tags: that's #1111423. We haven't discussed making dgit start honouring its *own* quilt modes embedded in upload tags. If we were to do that, then with regard to *this* bug, there would no longer be a regression for our flagship dgit-maint-merge(7) workflow, in that you wouldn't have to do any local git configuration and wouldn't ever have to pass quilt mode options. We would still have lost 'dpkg-source --commit' with single-debian-patch but I think we are both okay with that. Taking a step back, it would overall be simpler if dgit and git-debpush worked the same way with regard to quilt modes embedded in tags: they both defer to the latest one written by either of them unless overridden on the command line. So how about we extend #1111423 to making dgit read quilt modes out of both its own tags and git-debpush's tags, and consider that to resolve the regression I'm concerned about in this bug? -- Sean Whitton
signature.asc
Description: PGP signature
