Hi, (should we trim the cc: list a bit)? On Thu, Jul 05, 2018 at 06:05:10PM +0800, Shengjing Zhu wrote: > Here's my thoughts about the workflow with Files-Excluded. > > 1. Upstream git history is imported *as is* in upstream branch. If we > want to maintain a upstream branch without some files, then we already > lost/mess up with the upstream history. Then why not use uscan git mode to > import the tarball, which results a single import commit. > > So IMHO, the upstream branch should only contain upstream commits. > Then question comes to how we create the dfsg orig tarball.
Just create a commit with the files filtered out and tag it approriately (with the original commit as parent). gbp export-orig/buildpackage will then be able to find it to create the tarball. Cheers, -- Guido > > 2. gbp used `git-archive` to generate the tarball, if the repo only > contains upstream git tree. > > Like what we proposed in pkg-go team, we don't even want pristine-tar > branch. we only want upstream git log. Most upstreams maintain go > libraries with git. > > I write a POC patch[1] to gbp to teach `gbp export-orig` to read > d/copyright and filter out files in Files-Excluded when running > `git-archive`. > > So if you run `gbp export-orig --exclude-with-copyright`, you will get a > orig tarball which excludes files in Files-Excluded. > > [1] https://github.com/agx/git-buildpackage/pull/56 > > -- > Regards, > Shengjing Zhu
