Hello, On Wed 15 Aug 2018 at 01:04PM +0100, Ian Jackson wrote:
> Package: dgit > Version: 6.6 > > Xen upstream has this in its .gitattributes: > .gitarchive-info export-subst > and this in .gitarchive-info: > Changeset: $Format:%H$ > Commit date: $Format:%cD$ > > dgit needs its Debian git trees to be identical to the source > packages; so if the Debian git branch is derived from upstream, it has > the unsubstituted version. But if the user used git-archive > (directly, or via some other tool like git-deborig) the orig will have > the substitutions applied. git-deborig always gets this right. It forcefully overrides any export-subst or export-ignore git attributes that may be present, runs git-archive(1), and then puts the git attributes back. > I think sensible options include some combination of: > > 1. Just add -export-subst -export-ignore to the set which we > disable, and update the bug report against git to widen the > scope of the requested do-all-these-things attribute. > > 2. When quilt fixup fails and the tree has a .gitattributes, print a > warning. This is probably a good idea anyway. > > 3. Provide a single command to disable these export ones too. > > In all cases there should be a new test which does git-archive. > > I am inclined to do (2), thus pushing more of the cost of this > ill-advised git feature onto the users who care about it, and away > from users who do not (and developers like me who are trying to > support those latter users). I would suggest (2), plus printing a recommendation to use git-deborig rather than raw git-archive when you're generating orig tarballs. git-deborig already has all the flexibility a package maintainer should need, so it seems superfluous to add cleverness to dgit. -- Sean Whitton
signature.asc
Description: PGP signature
