3 dgit - tutorial for package maintainers, using a workflow centered around git-merge(1)
7 This document describes elements of a workflow for maintaining a
8 non-native Debian package using B<dgit>. The workflow makes the
9 following opinionated assumptions:
15 Git histories should be the non-linear histories produced by
16 git-merge(1), preserving all information about divergent development
17 that was later brought together.
21 Maintaining convenient and powerful git workflows takes priority over
22 the usefulness of the raw Debian source package. The Debian archive
23 is thought of as an output format.
25 For example, we don't spend time curating a series of quilt patches.
27 in straightforward cases,
28 the information such a series would contain is readily
29 available from B<dgit-repos>.
33 It is more important to have the Debian package's git history be a
34 descendent of upstream's git history than to use exactly the orig.tar
35 that upstream makes available for download.
39 This workflow is less suitable for some packages.
40 When the Debian delta contains multiple pieces which interact,
41 or which you aren't going to be able to upstream soon,
42 it might be preferable to
43 maintain the delta as a rebasing patch series.
44 For such a workflow see for example
45 dgit-maint-debrebase(7) and dgit-maint-gbp(7).
47 =head1 INITIAL DEBIANISATION
49 This section explains how to start using this workflow with a new
50 package. It should be skipped when converting an existing package to
53 =head2 When upstream tags releases in git
55 Suppose that the latest stable upstream release is 1.2.2, and this has
56 been tagged '1.2.2' by upstream.
60 % git clone -oupstream https://some.upstream/foo.git
62 % git verify-tag 1.2.2
63 % git reset --hard 1.2.2
64 % git branch --unset-upstream
68 The final command detaches your master branch from the upstream remote,
69 so that git doesn't try to push anything there, or merge unreleased
70 upstream commits. If you want to maintain a copy of your packaging
71 branch on B<salsa.debian.org> in addition to B<dgit-repos>, you can
72 do something like this:
76 % git remote add -f origin salsa.debian.org:Debian/foo.git
77 % git push --follow-tags -u origin master
81 Now go ahead and Debianise your package. Just make commits on the
82 master branch, adding things in the I<debian/> directory. If you need
83 to patch the upstream source, just make commits that change files
84 outside of the I<debian/> directory. It is best to separate commits
85 that touch I<debian/> from commits that touch upstream source, so that
86 the latter can be cherry-picked by upstream.
88 Note that there is no need to maintain a separate 'upstream' branch,
89 unless you also happen to be involved in upstream development. We
90 work with upstream tags rather than any branches, except when
91 forwarding patches (see FORWARDING PATCHES UPSTREAM, below).
93 Finally, you need an orig tarball:
101 See git-deborig(1) if this fails.
103 This tarball is ephemeral and easily regenerated, so we don't commit
104 it anywhere (e.g. with tools like pristine-tar(1)).
106 =head3 Verifying upstream's tarball releases
110 It can be a good idea to compare upstream's released tarballs with the
111 release tags, at least for the first upload of the package. If they
112 are different, you might need to add some additional steps to your
113 I<debian/rules>, such as running autotools.
115 A convenient way to perform this check is to import the tarball as
116 described in the following section, using a different value for
117 'upstream-tag', and then use git-diff(1) to compare the imported
118 tarball to the release tag. If they are the same, you can use
119 upstream's tarball instead of running git-deborig(1).
123 =head3 Using untagged upstream commits
127 Sometimes upstream does not tag their releases, or you want to package
128 an unreleased git snapshot. In such a case you can create your own
129 upstream release tag, of the form B<upstream/>I<ver>, where I<ver> is
130 the upstream version you plan to put in I<debian/changelog>. The
131 B<upstream/> prefix ensures that your tag will not clash with any tags
132 upstream later creates.
134 For example, suppose that the latest upstream release is 1.2.2 and you
135 want to package git commit ab34c21 which was made on 2013-12-11. A
136 common convention is to use the upstream version number
137 1.2.2+git20131211.ab34c21 and so you could use
141 % git tag -s upstream/1.2.2+git20131211.ab34c21 ab34c21
145 to obtain a release tag, and then proceed as above.
149 =head2 When upstream releases only tarballs
151 We need a virtual upstream branch with virtual release tags.
152 gbp-import-orig(1) can manage this for us. To begin
162 Now create I<debian/gbp.conf>:
167 upstream-branch = upstream
168 debian-branch = master
169 upstream-tag = upstream/%(version)s
173 pristine-tar-commit = False
181 gbp-import-orig(1) requires a pre-existing upstream branch:
185 % git add debian/gbp.conf && git commit -m "create gbp.conf"
186 % git checkout --orphan upstream
188 % git commit --allow-empty -m "initial, empty branch for upstream source"
189 % git checkout -f master
193 Then we can import the upstream version:
197 % gbp import-orig --merge --merge-mode=replace ../foo_1.2.2.orig.tar.xz
201 Our upstream branch cannot be pushed to B<dgit-repos>, but since we
202 will need it whenever we import a new upstream version, we must push
203 it somewhere. The usual choice is B<salsa.debian.org>:
207 % git remote add -f origin salsa.debian.org:Debian/foo.git
208 % git push --follow-tags -u origin master upstream
212 You are now ready to proceed as above, making commits to both the
213 upstream source and the I<debian/> directory.
215 =head1 CONVERTING AN EXISTING PACKAGE
217 This section explains how to convert an existing Debian package to
218 this workflow. It should be skipped when debianising a new package.
220 =head2 No existing git history
226 % git remote add -f upstream https://some.upstream/foo.git
230 =head2 Existing git history using another workflow
232 First, if you don't already have the git history locally, clone it,
233 and obtain the corresponding orig.tar from the archive:
237 % git clone git.debian.org:collab-maint/foo
243 Now dump any existing patch queue:
247 % git rm -rf debian/patches
248 % git commit -m "drop existing quilt patch queue"
252 Then make new upstream tags available:
256 % git remote add -f upstream https://some.upstream/foo.git
260 =for dgit-test dpkg-source-ignores begin
262 Now you simply need to ensure that your git HEAD is dgit-compatible,
263 i.e., it is exactly what you would get if you ran
264 B<dpkg-buildpackage -i'(?:^|/)\.git(?:/|$)' -I.git -S>
265 and then unpacked the resultant source package.
267 =for dgit-test dpkg-source-ignores end
269 To achieve this, you might need to delete
270 I<debian/source/local-options>. One way to have dgit check your
271 progress is to run B<dgit build-source>.
273 The first dgit push will require I<--overwrite>. If this is the first
274 ever dgit push of the package, consider passing
275 I<--deliberately-not-fast-forward> instead of I<--overwrite>. This
276 avoids introducing a new origin commit into your git history. (This
277 origin commit would represent the most recent non-dgit upload of the
278 package, but this should already be represented in your git history.)
280 =head1 SOURCE PACKAGE CONFIGURATION
282 =head2 debian/source/options
284 We set some source package options such that dgit can transparently
285 handle the "dropping" and "refreshing" of changes to the upstream
295 You don't need to create this file if you are using the version 1.0
296 source package format.
298 =head2 Sample text for debian/source/patch-header
300 It is a good idea to explain how a user can obtain a breakdown of the
301 changes to the upstream source:
305 The Debian packaging of foo is maintained in git,
306 using the merging workflow described in dgit-maint-merge(7).
307 There isn't a patch queue that can be represented as a quilt series.
309 A detailed breakdown of the changes is available from their
310 canonical representation -
311 git commits in the packaging repository.
312 For example, to see the changes made by the Debian maintainer in the
313 first upload of upstream version 1.2.3, you could use:
317 % git clone https://git.dgit.debian.org/foo
319 % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'
323 (If you have dgit, use `dgit clone foo`,
324 rather than plain `git clone`.)
326 A single combined diff, containing all the changes, follows.
330 If you are using the version 1.0 source package format, this text
331 should be added to README.source instead. The version 1.0 source
332 package format ignores debian/source/patch-header.
334 If you're using the version 3.0 (quilt) source package format, you
335 could add this text to README.source instead of
336 debian/source/patch-header, but this might distract from more
337 important information present in README.source.
339 =head1 BUILDING AND UPLOADING
341 Use B<dgit build>, B<dgit sbuild>, B<dgit pbuilder>, B<dgit
342 cowbuilder>, B<dgit push-source>, and B<dgit push> as detailed in
343 dgit(1). If any command fails, dgit will provide a carefully-worded
344 error message explaining what you should do. If it's not clear, file
345 a bug against dgit. Remember to pass I<--new> for the first upload.
347 If you want to upload with git-debpush(1), for the first upload you
348 should pass the B<--quilt=smash> quilt mode option (see
351 As another alternative to B<dgit build> and friends, you can use a
352 tool like gitpkg(1). This works because like dgit, gitpkg(1) enforces
353 that HEAD has exactly the contents of the source package. gitpkg(1)
354 is highly configurable, and one dgit user reports using it to produce
355 and test multiple source packages, from different branches
356 corresponding to each of the current Debian suites.
358 If you want to skip dgit's checks while iterating on a problem with
359 the package build (for example, you don't want to commit your changes
360 to git), you can just run dpkg-buildpackage(1) or debuild(1) instead.
362 =head1 NEW UPSTREAM RELEASES
364 =head2 Obtaining the release
366 =head3 When upstream tags releases in git
370 % git fetch --tags upstream
374 If you want to package an untagged upstream commit (because upstream
375 does not tag releases or because you want to package an upstream
376 development snapshot), see "Using untagged upstream commits" above.
378 =head3 When upstream releases only tarballs
380 You will need the I<debian/gbp.conf> from "When upstream releases only
381 tarballs", above. You will also need your upstream branch. Above, we
382 pushed this to B<salsa.debian.org>. You will need to clone or fetch
383 from there, instead of relying on B<dgit clone>/B<dgit fetch> alone.
389 % gbp import-orig ../foo_1.2.3.orig.tar.xz
393 or if you have a working watch file
397 % gbp import-orig --uscan
401 In the following, replace I<1.2.3> with I<upstream/1.2.3>.
403 =head2 Reviewing & merging the release
405 It's a good idea to preview the merge of the new upstream release.
406 First, just check for any new or deleted files that may need
407 accounting for in your copyright file:
411 % git diff --name-status --diff-filter=ADR master..1.2.3 -- . ':!debian'
415 You can then review the full merge diff:
419 % git merge-tree `git merge-base master 1.2.3` master 1.2.3 | $PAGER
423 Once you're satisfied with what will be merged, update your package:
428 % dch -v1.2.3-1 New upstream release.
429 % git add debian/changelog && git commit -m changelog
433 If you obtained a tarball from upstream, you are ready to try a build.
434 If you merged a git tag from upstream, you will first need to generate
443 =head1 HANDLING DFSG-NON-FREE MATERIAL
445 =head2 When upstream tags releases in git
447 We create a DFSG-clean tag to merge to master:
451 % git checkout -b pre-dfsg 1.2.3
453 % git commit -m "upstream version 1.2.3 DFSG-cleaned"
454 % git tag -s 1.2.3+dfsg
455 % git checkout master
456 % git branch -D pre-dfsg
460 Before merging the new 1.2.3+dfsg tag to master, you should first
461 determine whether it would be legally dangerous for the non-free
462 material to be publicly accessible in the git history on
465 If it would be dangerous, there is a big problem;
466 in this case please consult your archive administrators
467 (for Debian this is the dgit administrator dgit-owner@debian.org
468 and the ftpmasters ftpmaster@ftp-master.debian.org).
470 =head2 When upstream releases only tarballs
472 The easiest way to handle this is to add a B<Files-Excluded> field to
473 I<debian/copyright>, and a B<uversionmangle> setting in
474 I<debian/watch>. See uscan(1). Alternatively, see the I<--filter>
475 option detailed in gbp-import-orig(1).
477 =head1 FORWARDING PATCHES UPSTREAM
485 Create a new branch based off upstream's master branch.
489 git-cherry-pick(1) commits from your master branch onto your new
494 Push the branch somewhere and ask upstream to merge it, or use
495 git-format-patch(1) or git-request-pull(1).
499 For example (and it is only an example):
503 % # fork foo.git on GitHub
504 % git remote add -f fork git@github.com:spwhitton/foo.git
505 % git checkout -b fix-error upstream/master
506 % git config branch.fix-error.pushRemote fork
507 % git cherry-pick master^2
509 % # submit pull request on GitHub
513 Note that when you merge an upstream release containing your forwarded
514 patches, git and dgit will transparently handle "dropping" the patches
515 that have been forwarded, "retaining" the ones that haven't.
517 =head1 INCORPORATING NMUS
525 Alternatively, you can apply the NMU diff to your repository. The
526 next push will then require I<--overwrite>.
534 This tutorial was written and is maintained by Sean Whitton <spwhitton@spwhitton.name>. It contains contributions from other dgit contributors too - see the dgit copyright file.