3 dgit - tutorial for package maintainers already using git-buildpackage(1)
7 This document explains how B<dgit> can be incorporated into a
8 git-buildpackage(1) package-maintenance workflow. This should be read
9 jointly with git-buildpackage(1)'s documentation. Some reasons why
10 you might want to incorporate B<dgit> into your existing workflow:
16 Benefit from dgit's safety catches. In particular, ensure that your
17 upload always matches exactly your git HEAD.
21 Provide a better, more detailed git history to downstream dgit users,
22 such as people using dgit to do an NMU (see dgit-nmu-simple(7) and
27 Note that we assume a patches-unapplied repository: the upstream
28 source committed to the git repository is unpatched.
29 git-buildpackage(1) can work with patched-applied repositories, but is
30 normally used with patches-unapplied.
32 =head1 GIT CONFIGURATION
34 If you have configured an I<export-dir> in your gbp.conf, you should
39 % git config --global dgit.default.build-products-dir /home/spwhitton/build-area
47 % git config dgit.default.quilt-mode gbp
51 in your repository, you can omit I<--gbp> wherever it occurs below.
53 Note that this does require that you always work from your gbp master
54 branch, never the dgit patches-applied branch.
58 You can perform test builds like this:
62 % dgit [--include-dirty] gbp-build [OPTIONS]
66 where I<--include-dirty> is needed for testing uncommitted changes, and
67 I<OPTIONS> are any further options to be passed on to
70 If you are doing a source-only upload, you do not need to prepare a
71 I<_source.changes>, as B<dgit push-source> will take of that on your
74 If you need to include binaries with your upload, you will probably
75 want to use sbuild(1), pbuilder(1) or cowbuilder(1):
79 % dgit --rm-old-changes --gbp sbuild
83 replacing 'sbuild' with 'pbuilder' or 'cowbuilder' if appropriate.
85 We use I<--rm-old-changes> to ensure that there is exactly one changes
86 file corresponding to this package, so we can be confident we're
87 uploading what we intend (though B<dgit push> will do some safety
90 Note that none of the commands in this section are required to upload
91 with dgit. You can invoke gbp-buildpackage(1), pbuilder(1),
92 cowbuilder(1) and sbuild(1) directly. However, the defaults for these
93 tools may leave you with something that dgit will refuse to upload
94 because it doesn't match your git HEAD.
96 As a general rule, leave all signing and tagging to dgit.
100 Don't use I<--git-tag>: B<dgit push> will do this for you. To do a
105 % dgit --gbp push-source
109 or if you need to include binaries,
117 This will push your git history to the dgit-repos, but you probably
118 want to follow it up with a push to salsa.
120 You will need to pass I<--overwrite> if the previous upload was not
123 If this is first ever dgit push of the package, consider passing
124 I<--deliberately-not-fast-forward> instead of I<--overwrite>. This
125 avoids introducing a new origin commit into the dgit view of your git
126 history. (This origin commit would represent the most recent non-dgit
127 upload of the package, but this should already be represented in your
130 =head1 INCORPORATING NMUS
132 B<dgit pull> can't yet incorporate NMUs into patches-unapplied gbp
133 branches. You can just apply the NMU diff the traditional way. The
134 next upload will require I<--overwrite>.
142 This tutorial was written and is maintained by Sean Whitton <spwhitton@spwhitton.name>.