Control: tags 998394 + wontfix
Simon Josefsson writes ("Bug#1111696: --quilt=gbp should maybe tolerate
.gitignore patches"):
> Is what is triggering this to happen the following patch?
>
> https://salsa.debian.org/python-team/packages/python-securesystemslib/-/blob/debian/latest/debian/patches/02_rm_vendored_gitignore.diff?ref_type=heads
Yes. But that doesn't mean the patch is wrong.
IMO, it is wrong of gbp and dpkg-source (#908747) to permit the
maintainer to edit .gitignore and then upload a source package without
that changed .gitignore.
The .gitignore is part of the preferred form for modification, so
omitting edits to it from our published source code is a DFSG
violation. (It's a minor one, but even so, this is quite WTF.)
Because (unlike previous tools) dgit and tag2upload insist on
git==dsc, dgit must somehow resolve this discrepancy.
For "3.0 (quilt)" packages, dgit must convert the git to
patches-applied, implying that there is a "split view" - the
maintainer git and dgit view have different content. That split view
provides somewhere to hide the bump in the carpet. So dgit in
--quilt=gbp mode makes a patch for the .gitignore changes, and uploads
a dsc containing the edited .gitignore (and that patch).
For native package formats, it is sufficient simply to suppress
dpkg-source's default ignore rule. This forces dgit to have wrappers
for build tools, and can occasionally cause trouble. See eg #998394.
> I don't understand what problem the patch is trying to solve, so I could
> try to just remove it and see if anything breaks. Or make some other
> changes to the git packaging on Salsa to make tag2upload behave
> smoother.
Presumabloy the .gitignore was edited for a reason. Incomplete
.gitignore files are common and if fixing them is made easy,
developers often do so.
I don't know what the right thing to do in this package, but for
dgit/tag2upload I think the right thing is to continue the strategy of
avoiding ocean-boiling. Hence this bug :-).
Ian.
--
Ian Jackson <[email protected]> These opinions are my own.
Pronouns: they/he. If I emailed you from @fyvzl.net or @evade.org.uk,
that is a private address which bypasses my fierce spamfilter.
