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 "[" -d "] | " -wd " | " -wdd
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.
579 --clean=dpkg-source is the default.
583 requires the package's build dependencies.
589 the build-dependencies are not checked
592 to dpkg-buildpackage),
593 which violates policy, but may work in practice.
595 The rules clean target will only be run if it is needed:
596 when dgit is going to build source or binary packages
597 from your working tree,
598 rather than from your git branch
599 (for example because of --include-dirty
600 or because the binary package build uses your working tree).
603 dgit will check that there are (after rules clean, if applicable) no
604 untracked un-ignored files,
605 in case these are files you forgot to git add.
606 (Except that this check is not done
607 for a `3.0 (quilt)' package
608 when dgit has to apply patches, dirtily, to the working tree.)
609 If your package does not have a good .gitignore
610 you will probably need --clean=dpkg-source,no-check aka -wdn.
612 .BR --clean=dpkg-source "[" -d "]" ,no-check " | " -wdn " | " -wddn
613 Like --clean=dpkg-source, but
614 does not care about untracked un-ignored files.
617 The package is or may be new in this suite. Without this, dgit will
618 refuse to push. It may (for Debian, will) be unable to access the git
619 history for any packages which have been newly pushed and have not yet
623 Do not complain if the working tree does not match your git HEAD,
625 include the changes from your working tree.
626 This can be useful with build, if you plan to commit later. (dgit
627 push will still ensure that the .dsc you upload and the git tree
628 you push are identical, so this option won't make broken pushes.)
631 Deprecated alias for --include-dirty.
633 .BR --overwrite [=\fIprevious-version\fR]
634 Declare that your HEAD really does contain
635 all the (wanted) changes
636 from all versions listed in its changelog;
637 or, all (wanted) changes from
638 .IR previous-version .
639 This promise is needed when
640 your git branch is not a descendant
641 of the version in the archive
642 according to the git revision history.
644 It is safer not to specify
645 .IR previous-version ,
646 and usually it's not needed.
649 unless you know what you are doing.
651 This option is useful if you are the maintainer, and you have
652 incorporated NMU changes into your own git workflow in a way that
653 doesn't make your branch a fast forward from the NMU.
655 This option is also usually necessary
656 the first time a package is pushed with dgit push
657 to a particular suite.
659 .BR dgit-maint- \fI*\fR (7) .
664 specified, dgit will check that the version in the archive is
665 mentioned in your debian/changelog.
666 (This will avoid losing
669 unless someone committed to git a finalised changelog
670 entry, and then made later changes to that version.)
673 is specified, it ought to be the version currently in the archive.
675 dgit push --overwrite
676 will, if necessary, make a
677 pseudo-merge (that is, something that looks like the result
678 of git merge -s ours) to stitch the archive's version into your own
679 git history, so that your push is a fast forward from the archive.
682 .BR gbp ", " dpm " or " unpatched ,
683 implying a split between the dgit view and the
684 maintainer view, the pseudo-merge will appear only in the dgit view.)
686 .BR --delayed =\fIdays\fR
687 Upload to a DELAYED queue.
690 If the maintainer responds by cancelling
691 your upload from the queue,
692 and does not make an upload of their own,
693 this will not rewind the git branch on the dgit git server.
694 Other dgit users will then see your push
695 (with a warning message from dgit)
696 even though the maintainer wanted to abolish it.
697 Such users might unwittingly reintroduce your changes.
699 If this situation arises,
700 someone should make a suitable dgit push
701 to update the contents of dgit-repos
702 to a version without the controversial changes.
704 .BR --no-chase-dsc-distro
705 Tells dgit not to look online
706 for additional git repositories
707 containing information about a particular .dsc being imported.
708 Chasing is the default.
711 (such as fetch and pull),
713 means dgit will access only the git server
714 for the distro you are directly working with,
715 even if the .dsc was copied verbatim from another distro.
718 means dgit will work completely offline.
720 Disabling chasing can be hazardous:
721 if the .dsc names a git commit which has been rewritten
722 by those in charge of the distro,
723 this option may prevent that rewrite from being effective.
726 dgit fails to find necessary git commits.
728 .BR --save-dgit-view= \fIbranch\fR|\fIref\fR
729 Specifies that when a split view quilt mode is in operation,
731 (or looks up in its cache)
732 a dgit view corresponding to your HEAD,
733 the dgit view will be left in
735 The specified ref is unconditionally overwritten,
736 so don't specify a branch you want to keep.
738 This option is effective only with the following operations:
739 quilt-fixup; push; all builds.
740 And it is only effective with
745 If ref does not start with refs/
746 it is taken to be a branch -
747 i.e. refs/heads/ is prepended.
750 is a deprecated alias for
753 .BI --deliberately- something
754 Declare that you are deliberately doing
756 This can be used to override safety catches, including safety catches
757 which relate to distro-specific policies.
758 The use of --deliberately is declared and published in the signed tags
759 generated for you by dgit,
760 so that the archive software can give effect to your intent,
762 for the benefit humans looking at the history.
765 understood in the context of Debian are discussed below:
767 .BR --deliberately-not-fast-forward
768 Declare that you are deliberately rewinding history. When pushing to
769 Debian, use this when you are making a renewed upload of an entirely
770 new source package whose previous version was not accepted for release
771 from NEW because of problems with copyright or redistributibility.
773 In split view quilt modes,
774 this also prevents the construction by dgit of a pseudomerge
775 to make the dgit view fast forwarding.
777 --overwrite (which creates a suitable pseudomerge)
779 --deliberately-not-fast-forward
780 (which suppresses the pseudomerge and the fast forward checks)
782 --overwrite is usually better.
784 .BR --deliberately-include-questionable-history
785 Declare that you are deliberately including, in the git history of
786 your current push, history which contains a previously-submitted
787 version of this package which was not approved (or has not yet been
788 approved) by the ftpmasters. When pushing to Debian, only use this
789 option after verifying that: none of the rejected-from-NEW (or
790 never-accepted) versions in the git history of your current push, were
791 rejected by ftpmaster for copyright or redistributability reasons.
793 .BR --deliberately-fresh-repo
794 Declare that you are deliberately rewinding history and want to
795 throw away the existing repo. Not relevant when pushing to Debian,
796 as the Debian server will do this automatically when necessary.
799 When fixing up source format `3.0 (quilt)' metadata, insist on
800 generating a linear patch stack: one new patch for each relevant
802 If such a stack cannot be generated, fail.
803 This is the default for Debian.
805 HEAD should be a series of plain commits
806 (not touching debian/patches/),
808 with as ancestor a patches-applied branch.
811 When fixing up source format `3.0 (quilt)' metadata, prefer to
812 generate a linear patch stack
813 (as with --quilt=auto)
814 but if that doesn't seem possible,
815 try to generate a single squashed patch for all the changes made in git
816 (as with --quilt=smash).
817 This is not a good idea for an NMU in Debian.
820 When fixing up source format `3.0 (quilt)' metadata,
821 generate a single additional patch for all the changes made in git.
822 This is not a good idea for an NMU in Debian.
824 (If HEAD has any in-tree patches already, they must apply cleanly.
825 This will be the case for any trees produced by dgit fetch or clone;
826 if you do not change the upstream version
827 nor make changes in debian/patches,
828 it will remain true.)
831 Check whether source format `3.0 (quilt)' metadata would need fixing
832 up, but, if it does, fail. You must then fix the metadata yourself
833 somehow before pushing. (NB that dpkg-source --commit will not work
834 because the dgit git tree does not have a
838 .BR --quilt=nocheck " | " --no-quilt-fixup
839 Do not check whether up source format `3.0 (quilt)' metadata needs
840 fixing up. If you use this option and the metadata did in fact need
841 fixing up, dgit push will fail.
843 .BR -- [ quilt= ] gbp " | " -- [ quilt= ] dpm " | " --quilt=unapplied
844 Tell dgit that you are using a nearly-dgit-compatible git branch,
846 .BR "maintainer view" ,
848 do not want your branch changed by dgit.
853 is for use with git-buildpackage.
854 Your HEAD is expected to be
855 a patches-unapplied git branch, except that it might contain changes
856 to upstream .gitignore files. This is the default for dgit gbp-build.
861 is for use with git-dpm.
862 Your HEAD is expected to be
863 a patches-applied git branch,
864 except that it might contain changes to upstream .gitignore files.
867 specifies that your HEAD is a patches-unapplied git branch (and
868 that any changes to upstream .gitignore files are represented as
869 patches in debian/patches).
871 With --quilt=gbp|dpm|unapplied,
872 dgit push (or precursors like quilt-fixup and build) will automatically
873 generate a conversion of your git branch into the right form.
874 dgit push will push the
875 dgit-compatible form (the
877 to the dgit git server.
878 The dgit view will be visible to you
879 in the dgit remote tracking branches, but your own branch will
881 dgit push will create a tag
883 for the maintainer view, and the dgit tag
884 .BI archive/debian/ version
886 dgit quilt-fixup will merely do some checks,
887 and cache the maintainer view.
889 .B If you have a branch like this it is essential to specify the appropriate --quilt= option!
890 This is because it is not always possible to tell: a patches-unapplied
891 git branch of a package with one patch, for example, looks very like
892 a patches-applied branch where the user has used git revert to
893 undo the patch, expecting to actually revert it.
894 However, if you fail to specify the right \-\-quilt option,
895 and you aren't too lucky, dgit will notice the problem and stop,
898 .BR -d "\fIdistro\fR | " --distro= \fIdistro\fR
899 Specifies that the suite to be operated on is part of distro
901 This overrides the default value found from the git config option
902 .BR dgit-suite. \fIsuite\fR .distro .
903 The only effect is that other configuration variables (used
904 for accessing the archive and dgit-repos) used are
905 .BR dgit-distro. \fIdistro\fR .* .
907 If your suite is part of a distro that dgit already knows about, you
908 can use this option to make dgit work even if your dgit doesn't know
909 about the suite. For example, specifying
911 will work when the suite is an unknown suite in the Debian archive.
913 To define a new distro it is necessary to define methods and URLs
914 for fetching (and, for dgit push, altering) a variety of information both
915 in the archive and in dgit-repos.
916 How to set this up is not yet documented.
919 Specifies the .changes file which is to be uploaded. By default
920 dgit push looks for single .changes file in the parent directory whose
921 filename suggests it is for the right package and version.
925 pathname contains slashes, the directory part is also used as
927 .BR --build-products-dir ;
928 otherwise, the changes file is expected in that directory (by
933 When doing a build, delete any changes files matching
934 .IB package _ version _*.changes
935 before starting. This ensures that
936 dgit push (and dgit sbuild) will be able to unambiguously
937 identify the relevant changes files from the most recent build, even
938 if there have been previous builds with different tools or options.
939 The default is not to remove, but
940 .B \-\-no-rm-old-changes
941 can be used to override a previous \-\-rm-old-changes
942 or the .rm-old-changes configuration setting.
944 Note that \fBdgit push-source\fR will always find the right .changes,
945 regardless of this option.
947 .BI --build-products-dir= directory
948 Specifies where to find and create tarballs, binary packages,
949 source packages, .changes files, and so on.
951 By default, dgit uses the parent directory
954 Changing this setting may necessitate
955 moving .orig tarballs to the new directory,
956 so it is probably best to
958 .BI dgit.default.build-products-dir
959 configuration setting
960 (see CONFIGURATION, below)
961 which this command line option overrides).
964 Do not delete the destination directory if clone fails.
967 Generates a DEP-14 tag (eg
968 .BR debian/ \fIversion\fR)
969 as well as a dgit tag (eg
970 .BR archive/debian/ \fIversion\fR)
971 where possible. This is the default.
974 Do not generate a DEP-14 tag, except in split quilt view mode.
975 (On servers where only the old tag format is supported,
976 the dgit tag will have the DEP-14 name.
977 This option does not prevent that.)
979 .BI --dep14tag-always
980 Insist on generating a DEP-14 tag
981 as well as a dgit tag.
982 If the server does not support that, dgit push will fail.
985 Prints debugging information to stderr. Repeating the option produces
986 more output (currently, up to -DDDD is meaningfully different).
989 Specifies a git configuration option, to be used for this run.
990 dgit itself is also controlled by git configuration options.
992 .RI \fB-v\fR version "|\fB_\fR | " \fB--since-version=\fR version |\fB_\fR
995 option to pass to dpkg-genchanges, during builds. Changes (from
996 debian/changelog) since this version will be included in the built
997 changes file, and hence in the upload. If this option is not
998 specified, dgit will query the archive and use the latest version
999 uploaded to the intended suite.
1003 inhibits this, so that no -v option will be passed to dpkg-genchanges
1004 (and as a result, only the last stanza from debian/changelog will
1005 be used for the build and upload).
1007 .RI \fB-m\fR maintaineraddress
1008 Passed to dpkg-genchanges (eventually).
1010 .RI \fB--ch:\fR option
1011 Specifies a single additional option to pass, eventually, to
1014 Options which are safe to pass include
1018 although these should never be necessary with Debian since dgit
1019 automatically calculates whether .origs need to be uploaded.)
1021 For other options the caveat below applies.
1023 .RI \fB--curl:\fR option " | \fB--dput:\fR" option " |..."
1024 Specifies a single additional option to pass to
1029 .BR dpkg-buildpackage ,
1030 .BR dpkg-genchanges ,
1043 Can be repeated as necessary.
1045 Use of this ability should not normally be necessary.
1046 It is provided for working around bugs,
1047 or other unusual situations.
1048 If you use these options,
1049 you may violate dgit's assumptions
1050 about the behaviour of its subprograms
1053 For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild,
1054 the option applies only when the program is invoked directly by dgit.
1055 Usually, for passing options to dpkg-genchanges, you should use
1056 .BR --ch: \fIoption\fR.
1058 Specifying --git is not effective for some lower-level read-only git
1059 operations performed by dgit, and also not when git is invoked by
1060 another program run by dgit.
1062 See notes below regarding ssh and dgit.
1064 NB that --gpg:option is not supported (because debsign does not
1065 have that facility).
1070 distro config setting.
1072 .RI \fB--curl=\fR program " | \fB--dput=\fR" program " |..."
1073 Specifies alternative programs to use instead of
1078 .BR dpkg-buildpackage ,
1079 .BR dpkg-genchanges ,
1096 .BR dpkg-buildpackage ,
1097 .BR dpkg-genchanges ,
1101 this applies only when the program is invoked directly by dgit.
1105 specifies the command to run on the remote host when dgit
1106 rpush needs to invoke a remote copy of itself. (dgit also reinvokes
1107 itself as the EDITOR for dpkg-source --commit; this is done using
1108 argv[0], and is not affected by --dgit=).
1112 is used instead of gbp build or git-buildpackage. (The default is
1113 the latter unless the former exists on PATH.)
1116 is used instead of gbp pq.
1118 unusually, the specified value is split on whitespace
1119 to produce a command and possibly some options and/or arguments.
1121 For pbuilder and cowbuilder, the defaults are
1122 .BR "sudo -E pbuilder"
1124 .BR "sudo -E cowbuilder"
1126 Like with gbp-build and gbp pq,
1127 the specified value is split on whitespace.
1131 the default value is taken from the
1135 environment variables, if set (see below). And, for ssh, when accessing the
1136 archive and dgit-repos, this command line setting is overridden by the
1137 git config variables
1138 .BI dgit-distro. distro .ssh
1140 .B .dgit.default.ssh
1141 (which can in turn be overridden with -c). Also, when dgit is using
1142 git to access dgit-repos, only git's idea of what ssh to use (eg,
1146 .BI --existing-package= package
1147 dgit push needs to canonicalise the suite name. Sometimes, dgit
1148 lacks a way to ask the archive to do this without knowing the
1149 name of an existing package. Without --new we can just use the
1150 package we are trying to push. But with --new that will not work, so
1153 or use the value of this option. This option is not needed with the
1154 default mechanisms for accessing the archive.
1157 Print a usage summary.
1159 .BI --initiator-tempdir= directory
1160 dgit rpush uses a temporary directory on the invoking (signing) host.
1161 This option causes dgit to use
1163 instead. Furthermore, the specified directory will be emptied,
1164 removed and recreated before dgit starts, rather than removed
1165 after dgit finishes. The directory specified must be an absolute
1168 .BI --force- something
1169 Instructs dgit to try to proceed despite detecting
1170 what it thinks is going to be a fatal problem.
1171 .B This is probably not going to work.
1172 These options are provided as an escape hatch,
1173 in case dgit is confused.
1174 (They might also be useful for testing error cases.)
1176 .B --force-import-dsc-with-dgit-field
1177 Tell dgit import-dsc to treat a .dsc with a Dgit field
1178 like one without it.
1179 The result is a fresh import,
1180 discarding the git history
1181 that the person who pushed that .dsc was working with.
1183 .B --force-uploading-binaries
1186 even though dgit thinks your distro does not permit that.
1188 .B --force-uploading-source-only
1189 Carry on and do a source-only upload,
1190 without any binaries,
1191 even though dgit thinks your distro does not permit that,
1192 or does not permit that in this situation.
1194 .B --force-unrepresentable
1196 dgit thinks that your git tree contains changes
1197 (relative to your .orig tarballs)
1198 which dpkg-source is not able to represent.
1199 Your build or push will probably fail later.
1201 .B --force-changes-origs-exactly
1202 Use the set of .origs specified in your .changes, exactly,
1203 without regard to what is in the archive already.
1204 The archive may well reject your upload.
1206 .B --force-unsupported-source-format
1207 Carry on despite dgit not understanding your source package format.
1208 dgit will probably mishandle it.
1210 .B --force-dsc-changes-mismatch
1211 Do not check whether .dsc and .changes match.
1212 The archive will probably reject your upload.
1214 .BR --force-import-gitapply-absurd " | " --force-import-gitapply-no-absurd
1215 Force on or off the use of the absurd git-apply emulation
1216 when running gbp pq import
1217 when importing a package from a .dsc.
1218 See Debian bug #841867.
1220 dgit can be configured via the git config system.
1221 You may set keys with git-config (either in system-global or per-tree
1222 configuration), or provide
1224 on the dgit command line.
1226 Settings likely to be useful for an end user include:
1228 .BI dgit.default.build-products-dir
1229 Specifies where to find the built files to be uploaded,
1230 when --build-products-dir is not specified. The default is
1231 the parent directory
1234 .BR dgit-suite. \fIsuite\fR .distro " \fIdistro\fR"
1235 Specifies the distro for a suite. dgit keys off the suite name (which
1236 appears in changelogs etc.), and uses that to determine the distro
1237 which is involved. The config used is thereafter that for the distro.
1240 may be a glob pattern.
1242 .BI dgit.default.distro " distro"
1243 The default distro for an unknown suite.
1245 .BI dgit.default.default-suite " suite"
1246 The default suite (eg for clone).
1250 .BR dgit-distro. \fIdistro\fR . *,
1251 the default value used if there is no distro-specific setting.
1253 .BR dgit-distro. \fIdistro\fR .clean-mode
1254 One of the values for the command line --clean= option; used if
1255 --clean is not specified.
1257 .BR dgit-distro. \fIdistro\fR .clean-mode-newer
1259 but ignored if the value does not make sense to this version of dgit.
1260 Setting both .clean-mode and .clean-mode-newer is useful
1261 to provide a single git config compatible with different dgit versions.
1263 .BR dgit-distro. \fIdistro\fR .quilt-
1264 One of the values for the command line --quilt= option; used if
1265 --quilt is not specified.
1267 .BR dgit-distro. \fIdistro\fR .rm-old-changes
1268 Boolean, used if neither \-\-rm-old-changes nor \-\-no-rm-old-changes
1269 is specified. The default is not to remove.
1271 .BR dgit-distro. \fIdistro\fR .readonly " " auto | a " | " true | t | y | 1 " | " false | f | n | 0
1272 Whether you have push access to the distro.
1273 For Debian, it is OK to use auto, which uses readonly mode if you are
1274 not pushing right now;
1275 but, setting this to false will avoid relying on the mirror of the dgit
1276 git repository server.
1278 .BI dgit-distro. distro .keyid
1282 .BI dgit-distro. distro .mirror " url"
1284 .BI dgit-distro. distro .username
1285 Not relevant for Debian.
1287 .BI dgit-distro. distro .upload-host
1288 Might be useful if you have an intermediate queue server.
1290 .BI dgit-distro. distro .user-name " " dgit-distro. distro .user-email
1291 Values to configure for user.name and user.email in new git trees. If
1292 not specified, the DEBFULLNAME and DEBEMAIL environment variables are
1293 used, respectively. Only used if .setup-usermail is not disabled.
1295 .BI dgit-distro. distro .setup-useremail
1296 Whether to set user.name and user.email in new git trees.
1297 True by default. Ignored for dgit setup-setup-useremail, which does it anyway.
1299 .BI dgit-distro. distro .setup-mergechangelogs
1300 Whether to setup a merge driver which uses dpkg-mergechangelogs for
1301 debian/changelog. True by default. Ignored for dgit
1302 setup-mergechangelogs, which does it anyway.
1304 .BI dgit-distro. distro .setup-gitattributes
1305 Whether to configure .git/info/attributes
1306 to suppress checkin/checkout file content transformations
1308 True by default. Ignored for dgit setup-gitattributes, which does it anyway.
1310 .BI dgit-distro. distro .cmd- cmd
1311 Program to use instead of
1314 .BR -- \fIcmd\fR = "... ."
1316 .BI dgit-distro. distro .opts- cmd
1317 Extra options to pass to
1320 .BR -- \fIcmd\fR : "... ."
1321 To pass several options, configure multiple values in git config
1322 (with git config --add). The options for
1323 .BI dgit.default.opts- cmd
1324 .BI dgit-distro. distro /push.opts- cmd
1325 and are all used, followed by options from dgit's command line.
1326 .SH ACCESS CONFIGURATION
1327 There are many other settings which specify how a particular distro's
1328 services (archive and git) are provided. These should not normally be
1329 adjusted, but are documented for the benefit of distros who wish to
1332 .BI dgit-distro. distro .nominal-distro
1333 Shown in git tags, Dgit fields, and so on.
1335 .BI dgit-distro. distro .alias-canon
1336 Used for all access configuration lookup.
1338 .BR dgit-distro. \fIdistro\fR /push. *
1339 If set, overrides corresponding non \fB/push\fR config when
1340 .BR readonly=false ,
1344 .BI dgit-distro. distro .git-url
1346 .BR dgit-distro. \fIdistro\fR .git-url [ -suffix ]
1348 .BI dgit-distro. distro .git-proto
1350 .BI dgit-distro. distro .git-path
1352 .BR dgit-distro. \fIdistro\fR .git-check " " true | false | url | ssh-cmd
1354 .BI dgit-distro. distro .git-check-suffix
1356 .BR dgit-distro. \fIdistro\fR .diverts.divert " " new-distro | / \fIdistro-suffix\fR
1358 .BI dgit-distro. distro .git-create " " ssh-cmd | true
1360 .BR dgit-distro. \fIdistro\fR .archive-query " " ftpmasterapi: " | " madison: "\fIdistro\fR | " dummycat: "\fI/path\fR | " sshpsql: \fIuser\fR @ \fIhost\fR : \fIdbname\fR
1362 .BR dgit-distro. \fIdistro\fR .archive-query- ( url | tls-key | curl-ca-args )
1364 .BI dgit-distro. distro .madison-distro
1366 .BI dgit-distro. distro .archive-query-default-component
1368 .BI dgit-distro. distro .dgit-tag-format
1370 .BR dgit-distro. \fIdistro\fR .dep14tag " " want | no | always
1372 .BI dgit-distro. distro .ssh
1374 .BI dgit-distro. distro .sshpsql-dbname
1376 .BR dgit-distro. \fIdistro\fR . ( git | sshpsql ) - ( user | host | user-force )
1378 .BI dgit-distro. distro .backports-quirk
1380 .BI dgit-distro. distro .rewrite-map-enable
1382 .BR dgit-distro. \fIdistro\fR .source-only-uploads " " ok | always | never | not-wholly-new
1384 .BI dgit.default.old-dsc-distro
1386 .BI dgit.dsc-url-proto-ok. protocol
1388 .BI dgit.dsc-url-proto-ok.bad-syntax
1390 .BI dgit.default.dsc-url-proto-ok
1392 .BR dgit.vcs-git.suites " \fIsuite\fR[" ; ...]
1393 .SH ENVIRONMENT VARIABLES
1395 .BR DGIT_SSH ", " GIT_SSH
1396 specify an alternative default program (and perhaps arguments) to use
1397 instead of ssh. DGIT_SSH is consulted first and may contain arguments;
1398 if it contains any whitespace will be passed to the shell. GIT_SSH
1399 specifies just the program; no arguments can be specified, so dgit
1400 interprets it the same way as git does.
1402 also the --ssh= and --ssh: options.
1404 .BR DEBEMAIL ", " DEBFULLNAME
1405 Default git user.email and user.name for new trees. See
1406 .BR "dgit setup-new-tree" .
1408 .BR gpg ", " dpkg- "..., " debsign ", " git ", " curl ", " dput ", " LWP::UserAgent
1409 and other subprograms and modules used by dgit are affected by various
1410 environment variables. Consult the documentation for those programs
1414 a `dgit rebase-prep' command or some such to turn a
1415 fast-forwarding branch containing pseudo-merges
1416 back into a rebasing patch stack.
1417 It might have to leave a note
1418 for a future dgit push.
1420 If the dgit push fails halfway through,
1421 it is not necessarily restartable and
1423 It would be good to check that the proposed signing key is
1424 available before starting work.
1426 dgit's build functions, and dgit push, may make changes to
1427 your current HEAD. Sadly this is necessary for packages in the `3.0
1428 (quilt)' source format. This is ultimately due to what I consider
1429 design problems in quilt and dpkg-source.
1431 --dry-run does not always work properly, as not doing some of the git
1432 fetches may result in subsequent actions being different. Doing a
1433 non-dry-run dgit fetch first will help.
1434 --damp-run is likely to work much better.
1441 \fBgit-config\fP(1),
1442 \fBgit-buildpackage\fP(1),
1443 \fBdpkg-buildpackage\fP(1),
1445 https://browse.dgit.debian.org/