X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-sponsorship.7.pod;h=ed37ff5f1107956f49536a93850d52778ea28b81;hp=a32585b12d59904a3c6144c2f375adc455ea19b6;hb=67bd22fce4d2ca34f254a9b502c370304dd626e3;hpb=55acc92c353623f0896469c29c65f3b951e270e7 diff --git a/dgit-sponsorship.7.pod b/dgit-sponsorship.7.pod index a32585b1..ed37ff5f 100644 --- a/dgit-sponsorship.7.pod +++ b/dgit-sponsorship.7.pod @@ -71,7 +71,10 @@ The git branch. =item * -Any .orig tarballs which will be needed. +Any .orig tarballs which will be needed, +or sample git-archive(1) +or gbp-buildpackage(1) +command(s) to generate them. =item * @@ -119,8 +122,16 @@ in their handover email. If there are any .origs that are not in the archive already, the sponsor will need them as part of the upload. -The simplest approach is to -commit them with pristine-tar(1), e.g. +If the sponsee generated these tarballs with git-archive(1) +or gbp-buildpackage(1), +they can simply include a sample invocation of git-archive(1) +or ensure that a suitable gbp.conf is present +in the source package +to generate the tarball. + +Otherwise, the simplest approach is to +commit the orig tarballs +with pristine-tar(1), e.g. =over 4 @@ -138,7 +149,8 @@ or attach to the e-mail, if they are small. The sponsee should quote sha256sums of the .origs in their -handoff email. +handoff email, +unless they supplied commands to generate them. =back @@ -202,9 +214,8 @@ you can convert their tree into the standard dgit view: =over 4 - % dgit -wgf quilt-fixup - [ Watch for a message about split brain, and if so: ] - % git checkout -b dgit-view-for-review refs/dgit-intern/quilt-cache + % dgit -wgf --quilt=foo --dgit-view-save=unquilted quilt-fixup + % git checkout unquilted =back