2 .TH dgit 1 "" "Debian Project" "dgit"
4 dgit \- git integration with the Debian archive
8 [\fIdgit\-opts\fP] \fBclone\fP [\fIdgit\-opts\fP]
9 \fIpackage\fP [\fIsuite\fP] [\fB./\fP\fIdir|\fB/\fP\fIdir\fR]
12 [\fIdgit\-opts\fP] \fBfetch\fP|\fBpull\fP [\fIdgit\-opts\fP]
16 [\fIdgit\-opts\fP] \fBbuild\fP|\fBsbuild\fP|\fBbuild-source\fP
20 [\fIdgit\-opts\fP] \fBpbuilder\fP|\fBcowbuilder\fP
24 [\fIdgit\-opts\fP] \fBpush\fP|\fBpush-source\fP [\fIdgit\-opts\fP]
28 [\fIdgit\-opts\fP] \fBrpush\fR \fIbuild-host\fR\fB:\fR\fIbuild-dir\fR
32 [\fIdgit\-opts\fP] \fIaction\fR ...
35 allows you to treat the Debian archive as if it were a git
38 it allows Debian to publish the source of its packages
39 as git branches, in a format which is directly useable
42 This is the command line reference.
43 Please read the tutorial(s):
46 dgit-user(7) for users: edit, build and share packages
47 dgit-nmu-simple(7) for DDs: do a straightforward NMU
48 dgit-maint-native(7) for maintainers of Debian-native packages
49 dgit-maint-debrebase(7) for maintainers: a pure-git rebasish workflow
50 dgit-maint-merge(7) for maintainers: a pure-git merging workflow
51 dgit-maint-gbp(7) for maintainers already using git-buildpackage
52 dgit-sponsorship(7) for sponsors and sponsored contributors
53 dgit-downstream-dsc(7) setting up dgit push for a new distro
56 See \fBdgit(7)\fP for detailed information about the data
58 common problems likely to arise with certain kinds of package,
62 \fBdgit clone\fR \fIpackage\fP [\fIsuite\fP] [\fB./\fP\fIdir|\fB/\fP\fIdir\fR]
63 Consults the archive and dgit-repos to construct the git view of
70 in a new directory (named
73 also, downloads any necessary orig tarballs.
75 The suite's git tip is
76 left on the local branch
78 ready for work, and on the corresponding dgit remote tracking branch.
81 remote will be set up to point to the package's dgit-repos tree
82 for the distro to which
87 may be a combination of several underlying suites in the form
88 .IR mainsuite \fB,\fR subsuite ...;
89 see COMBINED SUITES in dgit(7).
91 For your convenience, the
93 remote will be set up from the package's Vcs-Git field, if there is
94 one - but note that in the general case the history found there may be
95 different to or even disjoint from dgit's view.
96 (See also dgit update-vcs-git.)
98 \fBdgit fetch\fR [\fIsuite\fP]
99 Consults the archive and git-repos to update the git view of
100 history for a specific suite (and downloads any necessary orig
101 tarballs), and updates the remote tracking branch
102 .BR remotes/dgit/dgit/ \fIsuite\fR.
103 If the current branch is
105 then dgit fetch defaults to
107 otherwise it parses debian/changelog and uses the suite specified
109 suite may be a combined suite, as for clone.
111 \fBdgit pull\fR [\fIsuite\fP]
112 Does dgit fetch, and then merges the new head of the remote tracking
114 .BI remotes/dgit/dgit/ suite
115 into the current branch.
117 \fBdgit checkout\fR \fIsuite\fR
118 Checks out the local branch
119 .BR dgit/ \fIsuite\fR.
121 If the branch does not exist,
122 dgit checkout creates it,
123 and sets it up the same way as dgit clone would.
125 the archive remote tracking branch does not exist,
126 dgit checkout will do a dgit fetch first.
128 NB: dgit checkout will only do a fetch if it has to.
129 If you already have the suite branch,
130 and want to merge your branch with updates from the archive,
133 dgit checkout will normally need to access the archive server,
134 to canonicalise the provided suite name.
135 The exception is if you specify the canonical name,
136 and the branch (or tracking branch) already exists.
141 with some suitable options. Options and arguments after build
142 will be passed on to dpkg-buildpackage. It is not necessary to use
143 dgit build when using dgit; it is OK to use any approach which ensures
144 that the generated source package corresponds to the relevant git
147 Tagging, signing and actually uploading should be left to dgit push.
149 dgit's build operations access the network,
150 to get the -v option right.
153 \fBdgit build-source\fR ...
154 Builds the source package, and a changes file for a prospective
155 source-only upload, using
157 The output is left in
158 .IR package \fB_\fR version \fB.dsc\fR
160 .IR package \fB_\fR version \fB_source.changes\fR.
162 Tagging, signing and actually uploading should be left to dgit
163 push-source, or dgit push.
166 Cleans the current working tree (according to the --clean= option in
169 \fBdgit update-vcs-git\fR [\fIsuite\fP|\fB.\fR] [\fB--\fR] [\fIgit fetch options\fR]
171 \fBdgit update-vcs-git\fR [\fIsuite|\fP\fB.\fR] \fB-\fR
172 Sets up, or updates the url of, the vcs-git remote, and
173 (unless \fB-\fR was specified)
174 runs git fetch on it.
176 By default, the Vcs-Git field of the .dsc from Debian sid is used,
177 as that is probably most up to date.
178 Another suite may be specified, or
180 to indicate that the Vcs-Git of the cwd's debian/control should
184 Print a usage summary.
186 \fBdgit sbuild\fR ...
187 Constructs the source package, uses
189 to do a binary build, and uses mergechanges to merge the source and
190 binary changes files. Options and arguments after sbuild will be
192 The output is left in
193 .IR package \fB_\fR version \fB_multi.changes\fR.
196 sbuild does not build arch-independent packages.
197 You probably want to pass -A, to request those.
199 Tagging, signing and actually uploading should be left to dgit push.
201 \fBdgit pbuilder\fR [\fIdebbuildopts\fP]
202 Constructs the source package, uses
204 to do a binary build, and uses mergechanges to merge the source and
205 binary changes files.
206 The output is left in
207 .IR package \fB_\fR version \fB_multi.changes\fR.
209 You should ensure that your dgit --build-products-dir setting matches
210 your pbuilder --buildresult.
212 The \fIdebbuildopts\fP are passed to pbuilder using its --debbuildopts
213 option. If you want to pass other options to pbuilder, use the
214 \fB--pbuilder:\fR dgit option as described below
215 (remember that dgit options should appear between \fBdgit\fR and
218 You should ensure that in your pbuilderrc you do
221 .B SOURCE_ONLY_CHANGES=yes
222 as this may cause trouble.
224 \fBdgit cowbuilder\fR [\fIdebbuildopts\fP]
225 Like \fBdgit pbuilder\fR, but uses
230 \fBdgit gbp-build\fR ...
233 with some suitable options. Options and arguments after gbp-build
234 will be passed on to git-buildpackage.
236 By default this uses \-\-quilt=gbp, so HEAD should be a
237 git-buildpackage style branch, not a patches-applied branch.
239 Tagging, signing and actually uploading should be left to dgit push.
241 \fBdgit push\fR [\fIsuite\fP]
242 Does an `upload', pushing the current HEAD to the archive (as a source
243 package) and to dgit-repos (as git commits). The package must already
244 have been built ready for upload, with the .dsc and .changes
245 left in the parent directory. It is normally best to do the build
246 with dgit too (eg with dgit sbuild): some existing build tools pass
247 unhelpful options to dpkg-source et al by default, which can result in
248 the built source package not being identical to the git tree.
250 In more detail: dgit push checks that the current HEAD corresponds to
251 the .dsc. It then pushes the HEAD to the suite's dgit-repos branch,
252 adjusts the .changes to include any .origs which the archive lacks
253 and exclude .origs which the archive has
254 (so -sa and -sd are not needed when building for dgit push),
255 makes a signed git tag, edits the .dsc to contain the dgit metadata
256 field, runs debsign to sign the upload (.dsc and .changes), pushes the
257 signed tag, and finally uses dput to upload the .changes to the
260 dgit push always uses the package, suite and version specified in the
261 debian/changelog and the .dsc, which must agree. If the command line
262 specifies a suite then that must match too.
264 When used on a git-debrebase branch,
265 dgit calls git-debrebase
266 to prepare the branch
267 for source package upload and push.
269 \fBdgit push-source\fR [\fIsuite\fP]
270 Without \fB-C\fR, builds a source package and dgit pushes it. Saying
271 \fBdgit push-source\fR is like saying "update the source code in the
272 archive to match my git HEAD, and let the autobuilders do the rest."
274 With \fB-C\fR, performs a dgit push, additionally ensuring that no
275 binary packages are uploaded.
277 \fBdgit rpush\fR \fIbuild-host\fR\fB:\fR\fIbuild-dir\fR [\fIpush args...\fR]
278 Pushes the contents of the specified directory on a remote machine.
279 This is like running dgit push on build-host with build-dir as the
280 current directory; however, signing operations are done on the
281 invoking host. This allows you to do a push when the system which has
282 the source code and the build outputs has no access to the key:
286 1. Clone on build host (dgit clone)
287 2. Edit code on build host (edit, git commit)
288 3. Build package on build host (dgit build)
289 4. Test package on build host or elsewhere (dpkg -i, test)
290 5. Upload by invoking dgit rpush on host with your GPG key.
293 However, the build-host must be able to ssh to the dgit repos. If
294 this is not already the case, you must organise it separately, for
295 example by the use of ssh agent forwarding.
297 The remaining arguments are treated just as dgit push would handle
300 build-host and build\-dir can be passed as separate
301 arguments; this is assumed to be the case if the first argument
302 contains no : (except perhaps one in [ ], to support IPv6 address
305 You will need similar enough versions of dgit on the build-host and
306 the invocation host. The build-host needs gnupg installed, with your
307 public key in its keyring (but not your private key, obviously).
309 .B dgit setup-new-tree
310 Configure the current working tree the way that dgit clone would have
311 set it up. Like running
312 .BR "dgit setup-useremail" ,
313 .B setup-mergechangelogs
315 .B setup-gitattributes
316 (but only does each thing if dgit is configured to do it automatically).
317 You can use these in any git repository, not just ones used with
318 the other dgit operations.
323 (as that requires Debian packaging information).
325 .B dgit setup-useremail
326 Set the working tree's user.name and user.email from the
327 distro-specific dgit configuration
328 .RB ( dgit-distro. \fIdistro\fR .user-name " and " .user-email ),
329 or DEBFULLNAME or DEBEMAIL.
331 .B dgit setup-mergechangelogs
332 Configures a git merge helper for the file
335 .BR dpkg-mergechangelogs .
337 .B dgit setup-gitattributes
338 Set up the working tree's
339 .B .git/info/attributes
340 to disable all transforming attributes for all files.
341 This is done by defining a macro attribute
349 Note that only attributes affecting the working tree are suppressed.
350 git-archive may remain exciting.
352 If there is an existing macro attribute line
353 .B [attr]dgit-defuse-attrs
354 in .git/info/attributes,
355 but it is insufficient,
356 because it was made by an earlier version of dgit
357 and git has since introduced new transforming attributes,
358 modifies the macro to disable the newer transformations.
360 (If there is already a macro attribute line
361 .B [attr]dgit-defuse-attrs
362 in .git/info/attributes
363 which does what dgit requires
364 (whatever files it effects),
365 this operation does nothing further.
366 This fact can be used to defeat or partially defeat
367 dgit setup-gitattributes
369 dgit setup-new-tree.)
372 `3.0 (quilt)' format source packages need changes representing not
373 only in-tree but also as patches in debian/patches. dgit quilt-fixup
374 checks whether this has been done; if not, dgit will make appropriate
375 patches in debian/patches and also commit the resulting changes to
378 This is normally done automatically by dgit build and dgit push.
380 dgit will try to turn each relevant commit in your git history into a
381 new quilt patch. dgit cannot convert nontrivial merges, or certain
382 other kinds of more exotic history. If dgit can't find a suitable
383 linearisation of your history, by default it will fail, but you can
384 ask it to generate a single squashed patch instead.
386 When used with a git-debrebase branch,
387 dgit will ask git-debrebase to prepare patches.
389 dgit can make patches in some situations where git-debrebase fails,
390 so dgit quilt-fixup can be useful in its own right.
391 To always use dgit's own patch generator
392 instead of git-debrebase make-patches,
393 pass --git-debrebase=true to dgit.
396 .B FORMAT 3.0 (QUILT)
400 \fBdgit import-dsc\fR [\fIsub-options\fR] \fI../path/to/.dsc\fR [\fB+\fR|\fB..\fR]branch
401 Import a Debian-format source package,
402 specified by its .dsc,
404 the way dgit fetch would do.
406 This does about half the work of dgit fetch:
407 it will convert the .dsc into a new, orphan git branch.
408 Since dgit has no access to a corresponding source package archive
409 or knowledge of the history
410 it does not consider whether this version is newer
411 than any previous import
412 or corresponding git branches;
413 and it therefore does not
414 make a pseudomerge to bind the import
415 into any existing git history.
417 Because a .dsc can contain a Dgit field naming a git commit
418 (which you might not have),
419 and specifying where to find that commit
420 (and any history rewrite table),
421 import-dsc might need online access.
423 (or dgit's efforts to find the commit fail),
424 consider --no-chase-dsc-distro
425 or --force-import-dsc-with-dgit-field.
427 There is only one sub-option:
429 .B --require-valid-signature
430 causes dgit to insist that the signature on the .dsc is valid
431 (using the same criteria as dpkg-source -x).
432 Otherwise, dgit tries to verify the signature but
433 the outcome is reported only as messages to stderr.
439 then if it already exists, it will be simply overwritten,
440 no matter its existing contents.
445 then if it already exists
446 and dgit actually imports the dsc
447 (rather than simply reading the git commit out of the Dgit field),
448 dgit will make a pseudomerge
449 so that the result is necessarily fast forward
450 from the existing branch.
451 Otherwise, if branch already exists,
452 dgit will stop with an error message.
456 does not start with refs/, refs/heads/ is prepended.
459 Prints version information and exits.
461 .BI "dgit clone-dgit-repos-server" " destdir"
462 Tries to fetch a copy of the source code for the dgit-repos-server,
463 as actually being used on the dgit git server, as a git tree.
465 .BI "dgit print-dgit-repos-server-source-url"
466 Prints the url used by dgit clone-dgit-repos-server.
467 This is hopefully suitable for use as a git remote url.
468 It may not be useable in a browser.
470 .BI "dgit print-dpkg-source-ignores"
471 Prints the -i and -I arguments which must be passed to dpkg-souce
472 to cause it to exclude exactly the .git directory
474 The separate arguments are unquoted, separated by spaces,
475 and do not contain spaces.
477 .B dgit print-unapplied-treeish
478 Constructs a tree-ish approximating the patches-unapplied state
479 of your 3.0 (quilt) package,
480 and prints the git object name to stdout.
481 This requires appropriate .orig tarballs.
482 This tree object is identical to your .origs
483 as regards upstream files.
484 The contents of the debian subdirectory is not interesting
485 and should not be inspected;
486 except that debian/patches will be identical to your HEAD.
488 To make this operate off-line,
489 the access configuration key
490 which is used to determine the build-products-dir
491 is the uncanonicalised version of the suite name from the changelog,
492 or (of course) dgit.default.build-products-dir.
493 See ACCESS CONFIGURATION, below.
495 This function is primarily provided for the benefit of git-debrebase.
498 .BR --dry-run " | " -n
499 Go through the motions, fetching all information needed, but do not
500 actually update the output(s). For push, dgit does
501 the required checks and leaves the new .dsc in a temporary file,
502 but does not sign, tag, push or upload.
504 .BR --damp-run " | " -L
505 Go through many more of the motions: do everything that doesn't
506 involve either signing things, or making changes on the public
512 for signing the tag and the upload. The default comes from the
515 config setting (see CONFIGURATION, below), or failing that, the
516 uploader trailer line in debian/changelog.
519 does not sign tags or uploads (meaningful only with push).
523 Specifies that we should process source package
525 rather than looking in debian/control or debian/changelog.
526 Valid with dgit fetch and dgit pull, only.
528 .BR --clean=git " | " -wg
531 to clean the working tree,
532 rather than running the package's rules clean target.
534 This will delete all files which are not tracked by git.
535 (Including any files you forgot to git add.)
538 options other than dpkg-source
539 are useful when the package's clean target is troublesome, or
540 to avoid needing the build-dependencies.
542 .BR --clean=git-ff " | " -wgf
544 .BR "git clean -xdff"
545 to clean the working tree.
548 but it also removes any subdirectories containing different git
549 trees (which only unusual packages are likely to create).
551 .BR --clean=check " | " --clean=check,ignores " | " -wc " | " -wci
552 Merely check that the tree is clean (does not contain uncommitted
554 Avoids running rules clean,
555 and can avoid needing the build-dependencies.
561 untracked files covered by .gitignore are tolerated,
562 so only files which show up as
565 (ie, ones you maybe forgot to git add)
566 are treated as a problem.
568 .BR --clean=none " | " -wn
569 Do not clean the tree, nor check that it is clean.
570 Avoids running rules clean,
571 and can avoid needing the build-dependencies.
573 files which are not in git, or if the build creates such files, a
574 subsequent dgit push will fail.
576 .BR --clean=dpkg-source " | " -wd
577 Use dpkg-buildpackage to do the clean, so that the source package
578 is cleaned by dpkg-source running the package's clean target.
580 Requires the package's build dependencies.
582 .BR --clean=dpkg-source-d " | " -wdd
584 .B dpkg-buildpackage -d
586 so that the source package
587 is cleaned by dpkg-source running the package's clean target.
588 The build-dependencies are not checked (due to
590 which violates policy, but may work in practice.
593 The package is or may be new in this suite. Without this, dgit will
594 refuse to push. It may (for Debian, will) be unable to access the git
595 history for any packages which have been newly pushed and have not yet
599 Do not complain if the working tree does not match your git HEAD,
601 include the changes from your working tree.
602 This can be useful with build, if you plan to commit later. (dgit
603 push will still ensure that the .dsc you upload and the git tree
604 you push are identical, so this option won't make broken pushes.)
607 Deprecated alias for --include-dirty.
609 .BR --overwrite [=\fIprevious-version\fR]
610 Declare that your HEAD really does contain
611 all the (wanted) changes
612 from all versions listed in its changelog;
613 or, all (wanted) changes from
614 .IR previous-version .
615 This promise is needed when
616 your git branch is not a descendant
617 of the version in the archive
618 according to the git revision history.
620 It is safer not to specify
621 .IR previous-version ,
622 and usually it's not needed.
625 unless you know what you are doing.
627 This option is useful if you are the maintainer, and you have
628 incorporated NMU changes into your own git workflow in a way that
629 doesn't make your branch a fast forward from the NMU.
631 This option is also usually necessary
632 the first time a package is pushed with dgit push
633 to a particular suite.
635 .BR dgit-maint- \fI*\fR (7) .
640 specified, dgit will check that the version in the archive is
641 mentioned in your debian/changelog.
642 (This will avoid losing
645 unless someone committed to git a finalised changelog
646 entry, and then made later changes to that version.)
649 is specified, it ought to be the version currently in the archive.
651 dgit push --overwrite
652 will, if necessary, make a
653 pseudo-merge (that is, something that looks like the result
654 of git merge -s ours) to stitch the archive's version into your own
655 git history, so that your push is a fast forward from the archive.
658 .BR gbp ", " dpm " or " unpatched ,
659 implying a split between the dgit view and the
660 maintainer view, the pseudo-merge will appear only in the dgit view.)
662 .BR --delayed =\fIdays\fR
663 Upload to a DELAYED queue.
666 If the maintainer responds by cancelling
667 your upload from the queue,
668 and does not make an upload of their own,
669 this will not rewind the git branch on the dgit git server.
670 Other dgit users will then see your push
671 (with a warning message from dgit)
672 even though the maintainer wanted to abolish it.
673 Such users might unwittingly reintroduce your changes.
675 If this situation arises,
676 someone should make a suitable dgit push
677 to update the contents of dgit-repos
678 to a version without the controversial changes.
680 .BR --no-chase-dsc-distro
681 Tells dgit not to look online
682 for additional git repositories
683 containing information about a particular .dsc being imported.
684 Chasing is the default.
687 (such as fetch and pull),
689 means dgit will access only the git server
690 for the distro you are directly working with,
691 even if the .dsc was copied verbatim from another distro.
694 means dgit will work completely offline.
696 Disabling chasing can be hazardous:
697 if the .dsc names a git commit which has been rewritten
698 by those in charge of the distro,
699 this option may prevent that rewrite from being effective.
702 dgit fails to find necessary git commits.
704 .BR --save-dgit-view= \fIbranch\fR|\fIref\fR
705 Specifies that when a split view quilt mode is in operation,
707 (or looks up in its cache)
708 a dgit view corresponding to your HEAD,
709 the dgit view will be left in
711 The specified ref is unconditionally overwritten,
712 so don't specify a branch you want to keep.
714 This option is effective only with the following operations:
715 quilt-fixup; push; all builds.
716 And it is only effective with
721 If ref does not start with refs/
722 it is taken to be a branch -
723 i.e. refs/heads/ is prepended.
726 is a deprecated alias for
729 .BI --deliberately- something
730 Declare that you are deliberately doing
732 This can be used to override safety catches, including safety catches
733 which relate to distro-specific policies.
734 The use of --deliberately is declared and published in the signed tags
735 generated for you by dgit,
736 so that the archive software can give effect to your intent,
738 for the benefit humans looking at the history.
741 understood in the context of Debian are discussed below:
743 .BR --deliberately-not-fast-forward
744 Declare that you are deliberately rewinding history. When pushing to
745 Debian, use this when you are making a renewed upload of an entirely
746 new source package whose previous version was not accepted for release
747 from NEW because of problems with copyright or redistributibility.
749 In split view quilt modes,
750 this also prevents the construction by dgit of a pseudomerge
751 to make the dgit view fast forwarding.
753 --overwrite (which creates a suitable pseudomerge)
755 --deliberately-not-fast-forward
756 (which suppresses the pseudomerge and the fast forward checks)
758 --overwrite is usually better.
760 .BR --deliberately-include-questionable-history
761 Declare that you are deliberately including, in the git history of
762 your current push, history which contains a previously-submitted
763 version of this package which was not approved (or has not yet been
764 approved) by the ftpmasters. When pushing to Debian, only use this
765 option after verifying that: none of the rejected-from-NEW (or
766 never-accepted) versions in the git history of your current push, were
767 rejected by ftpmaster for copyright or redistributability reasons.
769 .BR --deliberately-fresh-repo
770 Declare that you are deliberately rewinding history and want to
771 throw away the existing repo. Not relevant when pushing to Debian,
772 as the Debian server will do this automatically when necessary.
775 When fixing up source format `3.0 (quilt)' metadata, insist on
776 generating a linear patch stack: one new patch for each relevant
778 If such a stack cannot be generated, fail.
779 This is the default for Debian.
781 HEAD should be a series of plain commits
782 (not touching debian/patches/),
784 with as ancestor a patches-applied branch.
787 When fixing up source format `3.0 (quilt)' metadata, prefer to
788 generate a linear patch stack
789 (as with --quilt=auto)
790 but if that doesn't seem possible,
791 try to generate a single squashed patch for all the changes made in git
792 (as with --quilt=smash).
793 This is not a good idea for an NMU in Debian.
796 When fixing up source format `3.0 (quilt)' metadata,
797 generate a single additional patch for all the changes made in git.
798 This is not a good idea for an NMU in Debian.
800 (If HEAD has any in-tree patches already, they must apply cleanly.
801 This will be the case for any trees produced by dgit fetch or clone;
802 if you do not change the upstream version
803 nor make changes in debian/patches,
804 it will remain true.)
807 Check whether source format `3.0 (quilt)' metadata would need fixing
808 up, but, if it does, fail. You must then fix the metadata yourself
809 somehow before pushing. (NB that dpkg-source --commit will not work
810 because the dgit git tree does not have a
814 .BR --quilt=nocheck " | " --no-quilt-fixup
815 Do not check whether up source format `3.0 (quilt)' metadata needs
816 fixing up. If you use this option and the metadata did in fact need
817 fixing up, dgit push will fail.
819 .BR -- [ quilt= ] gbp " | " -- [ quilt= ] dpm " | " --quilt=unapplied
820 Tell dgit that you are using a nearly-dgit-compatible git branch,
822 .BR "maintainer view" ,
824 do not want your branch changed by dgit.
829 is for use with git-buildpackage.
830 Your HEAD is expected to be
831 a patches-unapplied git branch, except that it might contain changes
832 to upstream .gitignore files. This is the default for dgit gbp-build.
837 is for use with git-dpm.
838 Your HEAD is expected to be
839 a patches-applied git branch,
840 except that it might contain changes to upstream .gitignore files.
843 specifies that your HEAD is a patches-unapplied git branch (and
844 that any changes to upstream .gitignore files are represented as
845 patches in debian/patches).
847 With --quilt=gbp|dpm|unapplied,
848 dgit push (or precursors like quilt-fixup and build) will automatically
849 generate a conversion of your git branch into the right form.
850 dgit push will push the
851 dgit-compatible form (the
853 to the dgit git server.
854 The dgit view will be visible to you
855 in the dgit remote tracking branches, but your own branch will
857 dgit push will create a tag
859 for the maintainer view, and the dgit tag
860 .BI archive/debian/ version
862 dgit quilt-fixup will merely do some checks,
863 and cache the maintainer view.
865 .B If you have a branch like this it is essential to specify the appropriate --quilt= option!
866 This is because it is not always possible to tell: a patches-unapplied
867 git branch of a package with one patch, for example, looks very like
868 a patches-applied branch where the user has used git revert to
869 undo the patch, expecting to actually revert it.
870 However, if you fail to specify the right \-\-quilt option,
871 and you aren't too lucky, dgit will notice the problem and stop,
874 .BR -d "\fIdistro\fR | " --distro= \fIdistro\fR
875 Specifies that the suite to be operated on is part of distro
877 This overrides the default value found from the git config option
878 .BR dgit-suite. \fIsuite\fR .distro .
879 The only effect is that other configuration variables (used
880 for accessing the archive and dgit-repos) used are
881 .BR dgit-distro. \fIdistro\fR .* .
883 If your suite is part of a distro that dgit already knows about, you
884 can use this option to make dgit work even if your dgit doesn't know
885 about the suite. For example, specifying
887 will work when the suite is an unknown suite in the Debian archive.
889 To define a new distro it is necessary to define methods and URLs
890 for fetching (and, for dgit push, altering) a variety of information both
891 in the archive and in dgit-repos.
892 How to set this up is not yet documented.
895 Specifies the .changes file which is to be uploaded. By default
896 dgit push looks for single .changes file in the parent directory whose
897 filename suggests it is for the right package and version.
901 pathname contains slashes, the directory part is also used as
903 .BR --build-products-dir ;
904 otherwise, the changes file is expected in that directory (by
909 When doing a build, delete any changes files matching
910 .IB package _ version _*.changes
911 before starting. This ensures that
912 dgit push (and dgit sbuild) will be able to unambiguously
913 identify the relevant changes files from the most recent build, even
914 if there have been previous builds with different tools or options.
915 The default is not to remove, but
916 .B \-\-no-rm-old-changes
917 can be used to override a previous \-\-rm-old-changes
918 or the .rm-old-changes configuration setting.
920 Note that \fBdgit push-source\fR will always find the right .changes,
921 regardless of this option.
923 .BI --build-products-dir= directory
924 Specifies where to find and create tarballs, binary packages,
925 source packages, .changes files, and so on.
927 By default, dgit uses the parent directory
930 Changing this setting may necessitate
931 moving .orig tarballs to the new directory,
932 so it is probably best to
934 .BI dgit.default.build-products-dir
935 configuration setting
936 (see CONFIGURATION, below)
937 which this command line option overrides).
940 Do not delete the destination directory if clone fails.
943 Generates a DEP-14 tag (eg
944 .BR debian/ \fIversion\fR)
945 as well as a dgit tag (eg
946 .BR archive/debian/ \fIversion\fR)
947 where possible. This is the default.
950 Do not generate a DEP-14 tag, except in split quilt view mode.
951 (On servers where only the old tag format is supported,
952 the dgit tag will have the DEP-14 name.
953 This option does not prevent that.)
955 .BI --dep14tag-always
956 Insist on generating a DEP-14 tag
957 as well as a dgit tag.
958 If the server does not support that, dgit push will fail.
961 Prints debugging information to stderr. Repeating the option produces
962 more output (currently, up to -DDDD is meaningfully different).
965 Specifies a git configuration option, to be used for this run.
966 dgit itself is also controlled by git configuration options.
968 .RI \fB-v\fR version "|\fB_\fR | " \fB--since-version=\fR version |\fB_\fR
971 option to pass to dpkg-genchanges, during builds. Changes (from
972 debian/changelog) since this version will be included in the built
973 changes file, and hence in the upload. If this option is not
974 specified, dgit will query the archive and use the latest version
975 uploaded to the intended suite.
979 inhibits this, so that no -v option will be passed to dpkg-genchanges
980 (and as a result, only the last stanza from debian/changelog will
981 be used for the build and upload).
983 .RI \fB-m\fR maintaineraddress
984 Passed to dpkg-genchanges (eventually).
986 .RI \fB--ch:\fR option
987 Specifies a single additional option to pass, eventually, to
990 Options which are safe to pass include
994 although these should never be necessary with Debian since dgit
995 automatically calculates whether .origs need to be uploaded.)
997 For other options the caveat below applies.
999 .RI \fB--curl:\fR option " | \fB--dput:\fR" option " |..."
1000 Specifies a single additional option to pass to
1005 .BR dpkg-buildpackage ,
1006 .BR dpkg-genchanges ,
1019 Can be repeated as necessary.
1021 Use of this ability should not normally be necessary.
1022 It is provided for working around bugs,
1023 or other unusual situations.
1024 If you use these options,
1025 you may violate dgit's assumptions
1026 about the behaviour of its subprograms
1029 For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild,
1030 the option applies only when the program is invoked directly by dgit.
1031 Usually, for passing options to dpkg-genchanges, you should use
1032 .BR --ch: \fIoption\fR.
1034 Specifying --git is not effective for some lower-level read-only git
1035 operations performed by dgit, and also not when git is invoked by
1036 another program run by dgit.
1038 See notes below regarding ssh and dgit.
1040 NB that --gpg:option is not supported (because debsign does not
1041 have that facility).
1046 distro config setting.
1048 .RI \fB--curl=\fR program " | \fB--dput=\fR" program " |..."
1049 Specifies alternative programs to use instead of
1054 .BR dpkg-buildpackage ,
1055 .BR dpkg-genchanges ,
1072 .BR dpkg-buildpackage ,
1073 .BR dpkg-genchanges ,
1077 this applies only when the program is invoked directly by dgit.
1081 specifies the command to run on the remote host when dgit
1082 rpush needs to invoke a remote copy of itself. (dgit also reinvokes
1083 itself as the EDITOR for dpkg-source --commit; this is done using
1084 argv[0], and is not affected by --dgit=).
1088 is used instead of gbp build or git-buildpackage. (The default is
1089 the latter unless the former exists on PATH.)
1092 is used instead of gbp pq.
1094 unusually, the specified value is split on whitespace
1095 to produce a command and possibly some options and/or arguments.
1097 For pbuilder and cowbuilder, the defaults are
1098 .BR "sudo -E pbuilder"
1100 .BR "sudo -E cowbuilder"
1102 Like with gbp-build and gbp pq,
1103 the specified value is split on whitespace.
1107 the default value is taken from the
1111 environment variables, if set (see below). And, for ssh, when accessing the
1112 archive and dgit-repos, this command line setting is overridden by the
1113 git config variables
1114 .BI dgit-distro. distro .ssh
1116 .B .dgit.default.ssh
1117 (which can in turn be overridden with -c). Also, when dgit is using
1118 git to access dgit-repos, only git's idea of what ssh to use (eg,
1122 .BI --existing-package= package
1123 dgit push needs to canonicalise the suite name. Sometimes, dgit
1124 lacks a way to ask the archive to do this without knowing the
1125 name of an existing package. Without --new we can just use the
1126 package we are trying to push. But with --new that will not work, so
1129 or use the value of this option. This option is not needed with the
1130 default mechanisms for accessing the archive.
1133 Print a usage summary.
1135 .BI --initiator-tempdir= directory
1136 dgit rpush uses a temporary directory on the invoking (signing) host.
1137 This option causes dgit to use
1139 instead. Furthermore, the specified directory will be emptied,
1140 removed and recreated before dgit starts, rather than removed
1141 after dgit finishes. The directory specified must be an absolute
1144 .BI --force- something
1145 Instructs dgit to try to proceed despite detecting
1146 what it thinks is going to be a fatal problem.
1147 .B This is probably not going to work.
1148 These options are provided as an escape hatch,
1149 in case dgit is confused.
1150 (They might also be useful for testing error cases.)
1152 .B --force-import-dsc-with-dgit-field
1153 Tell dgit import-dsc to treat a .dsc with a Dgit field
1154 like one without it.
1155 The result is a fresh import,
1156 discarding the git history
1157 that the person who pushed that .dsc was working with.
1159 .B --force-uploading-binaries
1162 even though dgit thinks your distro does not permit that.
1164 .B --force-uploading-source-only
1165 Carry on and do a source-only upload,
1166 without any binaries,
1167 even though dgit thinks your distro does not permit that,
1168 or does not permit that in this situation.
1170 .B --force-unrepresentable
1172 dgit thinks that your git tree contains changes
1173 (relative to your .orig tarballs)
1174 which dpkg-source is not able to represent.
1175 Your build or push will probably fail later.
1177 .B --force-changes-origs-exactly
1178 Use the set of .origs specified in your .changes, exactly,
1179 without regard to what is in the archive already.
1180 The archive may well reject your upload.
1182 .B --force-unsupported-source-format
1183 Carry on despite dgit not understanding your source package format.
1184 dgit will probably mishandle it.
1186 .B --force-dsc-changes-mismatch
1187 Do not check whether .dsc and .changes match.
1188 The archive will probably reject your upload.
1190 .BR --force-import-gitapply-absurd " | " --force-import-gitapply-no-absurd
1191 Force on or off the use of the absurd git-apply emulation
1192 when running gbp pq import
1193 when importing a package from a .dsc.
1194 See Debian bug #841867.
1196 dgit can be configured via the git config system.
1197 You may set keys with git-config (either in system-global or per-tree
1198 configuration), or provide
1200 on the dgit command line.
1202 Settings likely to be useful for an end user include:
1204 .BI dgit.default.build-products-dir
1205 Specifies where to find the built files to be uploaded,
1206 when --build-products-dir is not specified. The default is
1207 the parent directory
1210 .BR dgit-suite. \fIsuite\fR .distro " \fIdistro\fR"
1211 Specifies the distro for a suite. dgit keys off the suite name (which
1212 appears in changelogs etc.), and uses that to determine the distro
1213 which is involved. The config used is thereafter that for the distro.
1216 may be a glob pattern.
1218 .BI dgit.default.distro " distro"
1219 The default distro for an unknown suite.
1221 .BI dgit.default.default-suite " suite"
1222 The default suite (eg for clone).
1226 .BR dgit-distro. \fIdistro\fR . *,
1227 the default value used if there is no distro-specific setting.
1229 .BR dgit-distro. \fIdistro\fR .clean-mode
1230 One of the values for the command line --clean= option; used if
1231 --clean is not specified.
1233 .BR dgit-distro. \fIdistro\fR .clean-mode-newer
1235 but ignored if the value does not make sense to this version of dgit.
1236 Setting both .clean-mode and .clean-mode-newer is useful
1237 to provide a single git config compatible with different dgit versions.
1239 .BR dgit-distro. \fIdistro\fR .quilt-
1240 One of the values for the command line --quilt= option; used if
1241 --quilt is not specified.
1243 .BR dgit-distro. \fIdistro\fR .rm-old-changes
1244 Boolean, used if neither \-\-rm-old-changes nor \-\-no-rm-old-changes
1245 is specified. The default is not to remove.
1247 .BR dgit-distro. \fIdistro\fR .readonly " " auto | a " | " true | t | y | 1 " | " false | f | n | 0
1248 Whether you have push access to the distro.
1249 For Debian, it is OK to use auto, which uses readonly mode if you are
1250 not pushing right now;
1251 but, setting this to false will avoid relying on the mirror of the dgit
1252 git repository server.
1254 .BI dgit-distro. distro .keyid
1258 .BI dgit-distro. distro .mirror " url"
1260 .BI dgit-distro. distro .username
1261 Not relevant for Debian.
1263 .BI dgit-distro. distro .upload-host
1264 Might be useful if you have an intermediate queue server.
1266 .BI dgit-distro. distro .user-name " " dgit-distro. distro .user-email
1267 Values to configure for user.name and user.email in new git trees. If
1268 not specified, the DEBFULLNAME and DEBEMAIL environment variables are
1269 used, respectively. Only used if .setup-usermail is not disabled.
1271 .BI dgit-distro. distro .setup-useremail
1272 Whether to set user.name and user.email in new git trees.
1273 True by default. Ignored for dgit setup-setup-useremail, which does it anyway.
1275 .BI dgit-distro. distro .setup-mergechangelogs
1276 Whether to setup a merge driver which uses dpkg-mergechangelogs for
1277 debian/changelog. True by default. Ignored for dgit
1278 setup-mergechangelogs, which does it anyway.
1280 .BI dgit-distro. distro .setup-gitattributes
1281 Whether to configure .git/info/attributes
1282 to suppress checkin/checkout file content transformations
1284 True by default. Ignored for dgit setup-gitattributes, which does it anyway.
1286 .BI dgit-distro. distro .cmd- cmd
1287 Program to use instead of
1290 .BR -- \fIcmd\fR = "... ."
1292 .BI dgit-distro. distro .opts- cmd
1293 Extra options to pass to
1296 .BR -- \fIcmd\fR : "... ."
1297 To pass several options, configure multiple values in git config
1298 (with git config --add). The options for
1299 .BI dgit.default.opts- cmd
1300 .BI dgit-distro. distro /push.opts- cmd
1301 and are all used, followed by options from dgit's command line.
1302 .SH ACCESS CONFIGURATION
1303 There are many other settings which specify how a particular distro's
1304 services (archive and git) are provided. These should not normally be
1305 adjusted, but are documented for the benefit of distros who wish to
1308 .BI dgit-distro. distro .nominal-distro
1309 Shown in git tags, Dgit fields, and so on.
1311 .BI dgit-distro. distro .alias-canon
1312 Used for all access configuration lookup.
1314 .BR dgit-distro. \fIdistro\fR /push. *
1315 If set, overrides corresponding non \fB/push\fR config when
1316 .BR readonly=false ,
1320 .BI dgit-distro. distro .git-url
1322 .BR dgit-distro. \fIdistro\fR .git-url [ -suffix ]
1324 .BI dgit-distro. distro .git-proto
1326 .BI dgit-distro. distro .git-path
1328 .BR dgit-distro. \fIdistro\fR .git-check " " true | false | url | ssh-cmd
1330 .BI dgit-distro. distro .git-check-suffix
1332 .BR dgit-distro. \fIdistro\fR .diverts.divert " " new-distro | / \fIdistro-suffix\fR
1334 .BI dgit-distro. distro .git-create " " ssh-cmd | true
1336 .BR dgit-distro. \fIdistro\fR .archive-query " " ftpmasterapi: " | " madison: "\fIdistro\fR | " dummycat: "\fI/path\fR | " sshpsql: \fIuser\fR @ \fIhost\fR : \fIdbname\fR
1338 .BR dgit-distro. \fIdistro\fR .archive-query- ( url | tls-key | curl-ca-args )
1340 .BI dgit-distro. distro .madison-distro
1342 .BI dgit-distro. distro .archive-query-default-component
1344 .BI dgit-distro. distro .dgit-tag-format
1346 .BR dgit-distro. \fIdistro\fR .dep14tag " " want | no | always
1348 .BI dgit-distro. distro .ssh
1350 .BI dgit-distro. distro .sshpsql-dbname
1352 .BR dgit-distro. \fIdistro\fR . ( git | sshpsql ) - ( user | host | user-force )
1354 .BI dgit-distro. distro .backports-quirk
1356 .BI dgit-distro. distro .rewrite-map-enable
1358 .BR dgit-distro. \fIdistro\fR .source-only-uploads " " ok | always | never | not-wholly-new
1360 .BI dgit.default.old-dsc-distro
1362 .BI dgit.dsc-url-proto-ok. protocol
1364 .BI dgit.dsc-url-proto-ok.bad-syntax
1366 .BI dgit.default.dsc-url-proto-ok
1368 .BR dgit.vcs-git.suites " \fIsuite\fR[" ; ...]
1369 .SH ENVIRONMENT VARIABLES
1371 .BR DGIT_SSH ", " GIT_SSH
1372 specify an alternative default program (and perhaps arguments) to use
1373 instead of ssh. DGIT_SSH is consulted first and may contain arguments;
1374 if it contains any whitespace will be passed to the shell. GIT_SSH
1375 specifies just the program; no arguments can be specified, so dgit
1376 interprets it the same way as git does.
1378 also the --ssh= and --ssh: options.
1380 .BR DEBEMAIL ", " DEBFULLNAME
1381 Default git user.email and user.name for new trees. See
1382 .BR "dgit setup-new-tree" .
1384 .BR gpg ", " dpkg- "..., " debsign ", " git ", " curl ", " dput ", " LWP::UserAgent
1385 and other subprograms and modules used by dgit are affected by various
1386 environment variables. Consult the documentation for those programs
1390 a `dgit rebase-prep' command or some such to turn a
1391 fast-forwarding branch containing pseudo-merges
1392 back into a rebasing patch stack.
1393 It might have to leave a note
1394 for a future dgit push.
1396 If the dgit push fails halfway through,
1397 it is not necessarily restartable and
1399 It would be good to check that the proposed signing key is
1400 available before starting work.
1402 dgit's build functions, and dgit push, may make changes to
1403 your current HEAD. Sadly this is necessary for packages in the `3.0
1404 (quilt)' source format. This is ultimately due to what I consider
1405 design problems in quilt and dpkg-source.
1407 --dry-run does not always work properly, as not doing some of the git
1408 fetches may result in subsequent actions being different. Doing a
1409 non-dry-run dgit fetch first will help.
1410 --damp-run is likely to work much better.
1417 \fBgit-config\fP(1),
1418 \fBgit-buildpackage\fP(1),
1419 \fBdpkg-buildpackage\fP(1),
1421 https://browse.dgit.debian.org/