X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-sponsorship.7.pod;h=3b8c3a8b3ad54a42e09a0150bae9f22be921052a;hp=40410e143cbed193ebc0edb8041a6393e5220a0d;hb=2c317e2cfb41c9cb5c9fa732e2ea4dbbda79fde7;hpb=1e4e44e19d1e2b24c1d7b4cbb0057662ee8434ee diff --git a/dgit-sponsorship.7.pod b/dgit-sponsorship.7.pod index 40410e14..3b8c3a8b 100644 --- a/dgit-sponsorship.7.pod +++ b/dgit-sponsorship.7.pod @@ -6,7 +6,7 @@ dgit-sponsorship - tutorial for Debian upload sponsorship, using git This tutorial describes how a Debian sponsored contributor and -their sponsoring DD (or DM) +a sponsoring DD (or DM) can collaborate and publish using git. The sponsor must to be intending to use dgit for the upload. @@ -59,7 +59,7 @@ options to dgit, or C or C, you must specify that in your handoff email - see below. -=head1 GIT+ORIGS BASED HANDOFF +=head2 git+origs based handoff The elements of the handoff consists of: @@ -89,8 +89,12 @@ constraints about upload timing, etc. If the handoff is done by email, the elements above should be a in a single, signed, message. +This could be an RFS submission +against the sponsorship-requests pseudo-package. -=head2 git branch +=head3 git branch + +=over 4 The sponsee should push their HEAD as a git branch to any suitable git server. @@ -102,11 +106,15 @@ and on the server, do not matter. The sponsee should not make a CI tag. -Instead, the sponsor should include the +Instead, the sponsee should include the git commit id of their HEAD in their handover email. -=head2 orig tarballs +=back + +=head3 orig tarballs + +=over 4 If there are any .origs that are not in the archive already, the sponsor will need them as part of the upload. @@ -132,7 +140,11 @@ if they are small. The sponsee should quote sha256sums of the .origs in their handoff email. -=head2 quilt options +=back + +=head3 quilt options + +=over 4 Some workflows involve git branches which are not natively dgit-compatible. @@ -162,7 +174,7 @@ This part is addressed to the sponsor: You should check the signature on the email. -Use C to fetch the git branch +Use C or C to obtain the git branch prepared by your sponsee, and obtain any .origs mentioned by the sponsee (to extract .origs committed with pristine-tar,