X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit-sponsorship.7.pod;h=08083290c1139e14bd83cc7b41733ee1b4a89816;hb=b822b6c13035de35290d03c497fdbd72560e3d34;hp=3b8c3a8b3ad54a42e09a0150bae9f22be921052a;hpb=5439ecadb25350a6a5a63097fcaeabaf656128e6;p=dgit.git
diff --git a/dgit-sponsorship.7.pod b/dgit-sponsorship.7.pod
index 3b8c3a8b..08083290 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 *
@@ -104,8 +107,6 @@ alioth is another possibility.
The branch names used by the sponsee on their local machine,
and on the server, do not matter.
-The sponsee should not make a CI tag.
-
Instead, the sponsee should include the
git commit id of their HEAD
in their handover email.
@@ -119,8 +120,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 +147,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
@@ -178,7 +188,8 @@ 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,
-you can use origtargz(1).)
+you can use origtargz(1),
+or use "gbp clone --pristine-tar".)
Check the git commit ID of the sponsee's branch tip,
and the sha256sums of the .origs,
@@ -195,9 +206,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
@@ -227,14 +237,34 @@ or similar, to to the build, and then
C
to do the upload.
-(If you switched to the quilt-cache dgit view,
-B pass the --quilt or --gbp or --dpm option again.)
+Check whether the sponsee made a debian/I tag.
+If they did,
+ensure you have their tag in the repository you are pushing from,
+or pass C<--no-dep14tag>.
+This avoids identically named, non-identical tags,
+which can be confusing.
+
+(It is possible to upload from
+the quilt-cache dgit view.
+If you want to do this,
+B pass the C<--quilt> or C<--gbp> or C<--dpm> options again,
+and B pass C<--no-dep14tag>,
+since the debian/I tag
+should go on the sponsee's branch.)
If this was the first upload done with dgit,
you may need to pass
C<--overwrite>
to dgit.
+Alternatively,
+if this was the first ever dgit push of the package,
+you can pass C<--deliberately-not-fast-forward>
+instead of C<--overwrite>.
+This avoids introducing a new origin commit
+into the dgit view of
+the sponsee's git history
+which is unnecessary and could be confusing.
=head1 SPONSORING A NON-GIT-USING SPONSEE
@@ -258,6 +288,17 @@ Then:
=back
+Or for an entirely new package:
+
+=over 4
+
+ % mkdir PACKAGE
+ % cd PACKAGE
+ % git init
+ % dgit -pPACKAGE import-dsc /path/to/sponsee's.dsc +sponsee
+
+=back
+
This will leave you looking at the sponsee's package,
formatted as a dgit branch.