1. Forum
  2. Usenet
  3. LINUX.DEBIAN.DEVEL

  • git tooling to handle files-excluded while preserving upstream history

    From Daniel =?utf-8?Q?Gr=C3=B6ber?=@21:1/5 to All on Tue Jul 16 11:40:01 2024
    Hi d-devel,

    since this came up in #d-mentors recently: is anyone working on nicer
    tooling in the vein of gbp-import-ref but with the ability to handle Files-Excluded like mk-origtargz?

    Some packages are starting to resort to hacks: https://salsa.debian.org/rust-team/mdBook/-/blob/debian/latest/debian/delete-excluded

    I feel like we should start supporting this somewhere more central.

    --Daniel

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Gioele Barabucci@21:1/5 to All on Tue Jul 16 12:20:01 2024
    On 16/07/24 11:36, Daniel Gröber wrote:
    since this came up in #d-mentors recently: is anyone working on nicer
    tooling in the vein of gbp-import-ref but with the ability to handle Files-Excluded like mk-origtargz?

    Because having DFSG-clean "debian" branches is (at the moment) a
    nice-to-have feature, but creating DFSG-clean origtgz files is a must,
    perhaps the first step should be to teach gbp-export-orig to respect Files-Excluded, see <https://bugs.debian.org/1069324>.

    Regards,

    --
    Gioele Barabucci

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Daniel =?utf-8?Q?Gr=C3=B6ber?=@21:1/5 to Gioele Barabucci on Tue Jul 16 15:30:02 2024
    On Tue, Jul 16, 2024 at 12:16:44PM +0200, Gioele Barabucci wrote:
    On 16/07/24 11:36, Daniel Gröber wrote:
    since this came up in #d-mentors recently: is anyone working on nicer tooling in the vein of gbp-import-ref but with the ability to handle Files-Excluded like mk-origtargz?

    Because having DFSG-clean "debian" branches is (at the moment) a
    nice-to-have feature, but creating DFSG-clean origtgz files is a must, perhaps the first step should be to teach gbp-export-orig to respect Files-Excluded, see <https://bugs.debian.org/1069324>.

    Right, thanks for the link. That certainly is one angle of attack and I
    hope someone does tackle it given how popular gbp is, but it's not the only game in town.

    Personally I'm moving away from gbp toward the dgit patches-applied
    workflows so I'd be interested in something that can work there (too?).

    A quick chat with Ian on IRC illuminates the situation: git-deborig
    (dgit/t2u's equivalent of gbp-export-orig) can't directly do this as it
    would break dgit's "tarball equals git exactly" invariant.

    This needs do be done as a seperate tool that commits the removals into
    git. I think the same tool could also work for the gbp case unless I'm
    missing something.

    If nobody has a tool like that in the works yet I may have a stab at it.

    If anyone has any spare cycles I'd also like us think about how a
    full-blown git-filter-branch/-repo invocation would fit into the picture so perhaps the interface could handle those in the future.

    --Daniel

    -----BEGIN PGP SIGNATURE-----

    iQIzBAABCAAdFiEEV6G/FbT2+ZuJ7bKf05SBrh55rPcFAmaWdY8ACgkQ05SBrh55 rPdvmQ//efeY/InWCGoku+EYTeIPTdLsAAJN7FjhggODhIy47QZKMkO50pFM4pB8 3Z+Z4vsPOumwUCBLNFk9w/77coUJKmIYMqQKxQfCCM2Z0MZgFe6eByEBLzRSRYia Cfgx4nLb9e4kHP0CQ8h2C7h1pzkvY+yuvG5NRBTI8lyagZlGi0gJoktFiHEWS7jc pJL9DA3qlpwlDby0FzkeVI7SLEY61XipDCsDzSvZM8jUmk6ihtr8sK6pqpvaJSHr g71v+wVLrsDuf8/UVGYaLNf67PMXPI0N90NEBhk7FjdVntSkJqfD6KH/7al7iz2J aSnSNchMr2av8qskgcVW4/7SdmkppKmqcKjc7e2U4lwRTk2gRzxC5tdXLGB8P/WH iJGwRk1H3lz4vJM4qpc3/LcRF718X3pmOtkl5pHjDT3xrJ7LbyKjUi+YHBzWkN20 wiqdDAUPXrGoCb4PJLcJNVeZ6wNbmsynLVxwjin8v2lMRJX5CwYX5WBQEEPkBgw8 ABWbwFI3wGbZjJowUPLfs6X5QpzsrEFIwudYSyz79CR4LmLJ16wDz/NgkmZyVri6 nSM6AoC0DgBpeO5HCowr6S9H7VInPtkdLC3dMKx7nMcLMFrkAF63IjJlIIzt4eIn KCrpr7HwXElN7e4dB1mB5mmagMJTk00Ed4kzO8eyRAf8rFxXyGY=
    =PblT
    -----END PGP SIGNATURE-----

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Sean Whitton@21:1/5 to All on Thu Jul 25 16:00:03 2024
    Hello,

    On Tue 16 Jul 2024 at 03:28pm +02, Daniel Gröber wrote:

    Right, thanks for the link. That certainly is one angle of attack and I
    hope someone does tackle it given how popular gbp is, but it's not the only game in town.

    Personally I'm moving away from gbp toward the dgit patches-applied
    workflows so I'd be interested in something that can work there (too?).

    A quick chat with Ian on IRC illuminates the situation: git-deborig (dgit/t2u's equivalent of gbp-export-orig) can't directly do this as it
    would break dgit's "tarball equals git exactly" invariant.

    This needs do be done as a seperate tool that commits the removals into
    git. I think the same tool could also work for the gbp case unless I'm missing something.

    If nobody has a tool like that in the works yet I may have a stab at it.

    If anyone has any spare cycles I'd also like us think about how a
    full-blown git-filter-branch/-repo invocation would fit into the picture so perhaps the interface could handle those in the future.

    I do a manual 'git rm', commit, and make a upstrea/foo+dfsg tag. It's
    not great. Automation would be nice.

    --
    Sean Whitton

    --=-=-Content-Type: application/pgp-signature; name="signature.asc"

    -----BEGIN PGP SIGNATURE-----

    iQJNBAEBCgA3FiEEm5FwB64DDjbk/CSLaVt65L8GYkAFAmaiWG8ZHHNwd2hpdHRv bkBzcHdoaXR0b24ubmFtZQAKCRBpW3rkvwZiQNIIEAC3ceyJ358EPBFuUFVRHr6A KuQkukxEwiBEgY0fDY2tw4TyoJWDjMvrt0YeYdW39yG/ZcIUTjLNgWWt04JwBb/q OvdDwh2TLZyEGcYv49erQ5N6u2f1xhJWAj7j5M1GUzi9Cnp3FLsw+VUz3vjkj4A2 FHo0xXTDZySaKreCoAyUFl4Ho4L6xcKD8NSsQtiJMPJO/9Jc6JlLRq37Aj4NC2/R 3Q7xDE3FRb9Um/rB92PxKn+VeSqqs2aRpLiOvxjoyGeowwDSj1+liIRKSDVO3O84 Om2nNSMotMn4gVFZ++WW5vBrdRJgK2/IwhBoWYEdsg2mgUOstKuHC8dmPflMh8rR TKUmLSA1HmCGLsGmGUJzqxAfm5p4WDmNDDEeKBW3fE/VjvjUa/BCEm1k4QPlmzZT TD1DCPYpxsDwLIl3PXfKUTWmEuLcklR6EoWCAnvAdbkYP9A7rdx0uS/xQnXoc7pj OCDGKBBQWWUMOreMfUNP9VxzDv27o+Ew6pu/xO92f51iovRs7omG+J+2bHVvHKaJ 2BH5m3cLsSyRAQWMUc6qA0WSffgGFW5HHteQMsmhV5cwUJPMUrMT5Wq7brG72UIg qRv64G/oYlZt0ZOZ3Mt69kJa32LdFk+HAvHbNTCwU/qSaDlveUt/sueA03e5ZkpM wKTezjgk7Q1pDDVh37aIxg==QwmC
    -----END PGP SIGNATURE-----

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Us