diff options
Diffstat (limited to 'po4a/dgit_1.pot')
| -rw-r--r-- | po4a/dgit_1.pot | 1073 |
1 files changed, 630 insertions, 443 deletions
diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot index c7d489b..bdfca0f 100644 --- a/po4a/dgit_1.pot +++ b/po4a/dgit_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-02 16:50+0000\n" +"POT-Creation-Date: 2022-12-29 00:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -75,14 +75,14 @@ msgstr "" #. type: Plain text #: ../dgit.1:26 -msgid "B<dgit> [I<dgit-opts>] B<push>|B<push-source> [I<dgit-opts>] [I<suite>]" +msgid "B<dgit> [I<dgit-opts>] B<push>|B<push-built> [I<dgit-opts>] [I<suite>]" msgstr "" #. type: Plain text #: ../dgit.1:30 msgid "" -"B<dgit> [I<dgit-opts>] B<rpush> I<build-host>B<:>I<build-dir> [I<push args..." -">]" +"B<dgit> [I<dgit-opts>] B<rpush>|B<rpush-built> I<build-host>B<:>I<build-dir> " +"[I<push args...>]" msgstr "" #. type: Plain text @@ -339,7 +339,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:148 ../dgit.1:200 ../dgit.1:240 +#: ../dgit.1:148 ../dgit.1:196 ../dgit.1:236 msgid "Tagging, signing and actually uploading should be left to dgit push." msgstr "" @@ -418,7 +418,7 @@ msgid "B<dgit help>" msgstr "" #. type: Plain text -#: ../dgit.1:185 ../dgit.1:1278 +#: ../dgit.1:185 ../dgit.1:1346 msgid "Print a usage summary." msgstr "" @@ -437,21 +437,14 @@ msgid "" "I<package>B<_>I<version>B<_multi.changes>." msgstr "" -#. type: Plain text -#: ../dgit.1:198 -msgid "" -"Note that by default sbuild does not build arch-independent packages. You " -"probably want to pass -A, to request those." -msgstr "" - #. type: TP -#: ../dgit.1:200 +#: ../dgit.1:196 #, no-wrap msgid "B<dgit pbuilder> [I<debbuildopts>]" msgstr "" #. type: Plain text -#: ../dgit.1:208 +#: ../dgit.1:204 msgid "" "Constructs the source package, uses B<pbuilder> to do a binary build, and " "uses mergechanges to merge the source and binary changes files. The output " @@ -459,14 +452,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:211 +#: ../dgit.1:207 msgid "" "You should ensure that your dgit --build-products-dir setting matches your " "pbuilder --buildresult." msgstr "" #. type: Plain text -#: ../dgit.1:217 +#: ../dgit.1:213 msgid "" "The I<debbuildopts> are passed to pbuilder using its --debbuildopts option. " "If you want to pass other options to pbuilder, use the B<--pbuilder:> dgit " @@ -475,75 +468,75 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:223 +#: ../dgit.1:219 msgid "" "You should ensure that in your pbuilderrc you do B<not> have the setting " "B<SOURCE_ONLY_CHANGES=yes> as this may cause trouble." msgstr "" #. type: TP -#: ../dgit.1:223 +#: ../dgit.1:219 #, no-wrap msgid "B<dgit cowbuilder> [I<debbuildopts>]" msgstr "" #. type: Plain text -#: ../dgit.1:229 +#: ../dgit.1:225 msgid "Like B<dgit pbuilder>, but uses B<cowbuilder> instead of B<pbuilder.>" msgstr "" #. type: TP -#: ../dgit.1:229 +#: ../dgit.1:225 #, no-wrap msgid "B<dgit gbp-build> ..." msgstr "" #. type: Plain text -#: ../dgit.1:235 +#: ../dgit.1:231 msgid "" "Runs B<git-buildpackage> with some suitable options. Options and arguments " "after gbp-build will be passed on to git-buildpackage." msgstr "" #. type: Plain text -#: ../dgit.1:238 +#: ../dgit.1:234 msgid "" "By default this uses --quilt=gbp, so HEAD should be a git-buildpackage style " "branch, not a patches-applied branch." msgstr "" #. type: TP -#: ../dgit.1:240 +#: ../dgit.1:236 #, no-wrap -msgid "B<dgit push> [I<suite>]" +msgid "B<dgit push-source> [I<suite>]" msgstr "" #. type: Plain text -#: ../dgit.1:249 +#: ../dgit.1:241 msgid "" -"Does an `upload', pushing the current HEAD to the archive (as a source " -"package) and to dgit-repos (as git commits). The package must already have " -"been built ready for upload, with the .dsc and .changes left in the parent " -"directory. It is normally best to do the build with dgit too (eg with dgit " -"sbuild): some existing build tools pass unhelpful options to dpkg-source et " -"al by default, which can result in the built source package not being " -"identical to the git tree." +"Does an `upload': sends the current HEAD to dgit-repos (as git commits), and " +"to the archive (as a source package, built by dgit push-source)." msgstr "" #. type: Plain text -#: ../dgit.1:259 +#: ../dgit.1:243 +msgid "This is the usual way to upload to Debian." +msgstr "" + +#. type: Plain text +#: ../dgit.1:254 msgid "" -"In more detail: dgit push checks that the current HEAD corresponds to the ." -"dsc. It then pushes the HEAD to the suite's dgit-repos branch, adjusts the ." -"changes to include any .origs which the archive lacks and exclude .origs " -"which the archive has (so -sa and -sd are not needed when building for dgit " -"push), makes a signed git tag, edits the .dsc to contain the dgit metadata " -"field, runs debsign to sign the upload (.dsc and .changes), pushes the " -"signed tag, and finally uses dput to upload the .changes to the archive." +"In more detail: dgit push-source builds a source package from HEAD. It then " +"pushes the HEAD to the suite's dgit-repos branch, adjusts the .changes to " +"include any .origs which the archive lacks and exclude .origs which the " +"archive has (so -sa and -sd are not needed when building for dgit push), " +"makes a signed git tag, edits the .dsc to contain the dgit metadata field, " +"runs debsign to sign the upload (.dsc and .changes), pushes the signed tag, " +"and finally uses dput to upload the .changes to the archive." msgstr "" #. type: Plain text -#: ../dgit.1:263 +#: ../dgit.1:258 msgid "" "dgit push always uses the package, suite and version specified in the debian/" "changelog and the .dsc, which must agree. If the command line specifies a " @@ -551,111 +544,129 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:268 +#: ../dgit.1:263 msgid "" "When used on a git-debrebase branch, dgit calls git-debrebase to prepare the " "branch for source package upload and push." msgstr "" +#. type: Plain text +#: ../dgit.1:267 +msgid "" +"With B<-C>, dgit push-source performs a dgit push-built, additionally " +"ensuring that no binary packages are uploaded." +msgstr "" + #. type: TP -#: ../dgit.1:268 +#: ../dgit.1:267 #, no-wrap -msgid "B<dgit push-source> [I<suite>]" +msgid "B<dgit push-built> [I<suite>]" msgstr "" #. type: Plain text -#: ../dgit.1:273 +#: ../dgit.1:274 msgid "" -"Without B<-C>, builds a source package and dgit pushes it. Saying B<dgit " -"push-source> is like saying \"update the source code in the archive to match " -"my git HEAD, and let the autobuilders do the rest.\"" +"Does an `upload' of a previously built package, possibly including " +"binaries. Sends the current HEAD to dgit-repos (as git commits); and, sends " +"the previously built source package and binaries to the archive." msgstr "" #. type: Plain text -#: ../dgit.1:276 +#: ../dgit.1:281 msgid "" -"With B<-C>, performs a dgit push, additionally ensuring that no binary " -"packages are uploaded." +"The package must already have been built ready for upload, with the .dsc " +"and .changes left in the parent directory. It is normally best to do the " +"build with dgit too (eg with dgit sbuild): some existing build tools pass " +"unhelpful options to dpkg-source et al by default, which can result in the " +"built source package not being identical to the git tree." +msgstr "" + +#. type: Plain text +#: ../dgit.1:286 +msgid "" +"dgit will check that the .dsc corresponds exactly to the current HEAD, " +"ensuring that all users whether of the dgit git view, or of the traditional " +"archive, see the same source package." msgstr "" #. type: TP -#: ../dgit.1:276 +#: ../dgit.1:286 #, no-wrap -msgid "B<dgit rpush> I<build-host>B<:>I<build-dir> [I<push args...>]" +msgid "B<dgit rpush-source>|B<rpush-built> I<build-host>B<:>I<src-dir> [I<push args...>]" msgstr "" #. type: Plain text -#: ../dgit.1:283 +#: ../dgit.1:293 msgid "" "Pushes the contents of the specified directory on a remote machine. This is " -"like running dgit push on build-host with build-dir as the current " -"directory; however, signing operations are done on the invoking host. This " -"allows you to do a push when the system which has the source code and the " -"build outputs has no access to the key:" +"like running dgit push on build-host with src-dir as the current directory; " +"however, signing operations are done on the invoking host. This allows you " +"to do a push when the system which has the source code (and any built " +"binaries) has no access to the key:" msgstr "" #. type: =item -#: ../dgit.1:286 ../dgit-maint-merge.7.pod:479 +#: ../dgit.1:296 ../dgit-maint-merge.7.pod:502 #, no-wrap msgid "1." msgstr "" #. type: tbl table -#: ../dgit.1:286 +#: ../dgit.1:296 #, no-wrap msgid "Clone on build host (dgit clone)" msgstr "" #. type: =item -#: ../dgit.1:287 ../dgit-maint-merge.7.pod:483 +#: ../dgit.1:297 ../dgit-maint-merge.7.pod:506 #, no-wrap msgid "2." msgstr "" #. type: tbl table -#: ../dgit.1:287 +#: ../dgit.1:297 #, no-wrap msgid "Edit code on build host (edit, git commit)" msgstr "" #. type: =item -#: ../dgit.1:288 ../dgit-maint-merge.7.pod:488 +#: ../dgit.1:298 ../dgit-maint-merge.7.pod:511 #, no-wrap msgid "3." msgstr "" #. type: tbl table -#: ../dgit.1:288 +#: ../dgit.1:298 #, no-wrap msgid "Build package on build host (dgit build)" msgstr "" #. type: tbl table -#: ../dgit.1:289 +#: ../dgit.1:299 #, no-wrap msgid "4." msgstr "" #. type: tbl table -#: ../dgit.1:289 +#: ../dgit.1:299 #, no-wrap msgid "Test package on build host or elsewhere (dpkg -i, test)" msgstr "" #. type: tbl table -#: ../dgit.1:290 +#: ../dgit.1:300 #, no-wrap msgid "5." msgstr "" #. type: tbl table -#: ../dgit.1:290 +#: ../dgit.1:300 #, no-wrap msgid "Upload by invoking dgit rpush on host with your GPG key." msgstr "" #. type: Plain text -#: ../dgit.1:296 +#: ../dgit.1:306 msgid "" "However, the build-host must be able to ssh to the dgit repos. If this is " "not already the case, you must organise it separately, for example by the " @@ -663,13 +674,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:299 +#: ../dgit.1:310 msgid "" -"The remaining arguments are treated just as dgit push would handle them." +"The remaining arguments are treated just as dgit push-source or dgit push-" +"built would handle them." msgstr "" #. type: Plain text -#: ../dgit.1:304 +#: ../dgit.1:315 msgid "" "build-host and build-dir can be passed as separate arguments; this is " "assumed to be the case if the first argument contains no : (except perhaps " @@ -677,7 +689,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:308 +#: ../dgit.1:319 msgid "" "You will need similar enough versions of dgit on the build-host and the " "invocation host. The build-host needs gnupg installed, with your public key " @@ -685,13 +697,112 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:308 +#: ../dgit.1:319 +#, no-wrap +msgid "B<dgit push>|B<rpush> I<...>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:330 +msgid "" +"Configurable aliases for B<dgit push-built> and B<dgit rpush-built>, which " +"will in the future change to mean B<dgit push-source> and B<dgit rpush-" +"source>, and therefore currently generate a warning." +msgstr "" + +#. type: Plain text +#: ../dgit.1:334 +msgid "" +"The behaviour of dgit push is controlled by the B<dgit.default.push-subcmd> " +"git config option:" +msgstr "" + +#. type: tbl table +#: ../dgit.1:336 +#, no-wrap +msgid "B<source>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:336 +#, no-wrap +msgid "runs B<dgit push-source>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:336 +#, no-wrap +msgid "future default" +msgstr "" + +#. type: tbl table +#: ../dgit.1:337 +#, no-wrap +msgid "B<built>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:337 +#, no-wrap +msgid "and runs B<dgit push-built>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:338 +#, no-wrap +msgid "B<built,warn>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:338 +#, no-wrap +msgid "warns, and runs B<dgit push-built>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:338 +#, no-wrap +msgid "current default" +msgstr "" + +#. type: tbl table +#: ../dgit.1:339 +#, no-wrap +msgid "B<reject>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:339 +#, no-wrap +msgid "fails" +msgstr "" + +#. type: Plain text +#: ../dgit.1:350 +msgid "" +"For dgit rpush, the behaviour is controlled by B<dgit.default.rpush-subcmd>, " +"falling back to B<dgit.default.push-subcmd> if that is not set. Because " +"dgit rpush is not typically run in a git working tree, only global git " +"config options (and B<-c> command line options) are relevant." +msgstr "" + +#. type: Plain text +#: ../dgit.1:360 +msgid "" +"These settings can safely be passed to older dgit (via B<-c);> the value " +"B<built> will be supported indefinitely. This should be used in scripts " +"that need to work with both old versions of dgit (that don't have B<push-" +"built>) and new versions (where B<push-source> is the default)." +msgstr "" + +#. type: TP +#: ../dgit.1:360 #, no-wrap msgid "B<dgit setup-new-tree>" msgstr "" #. type: Plain text -#: ../dgit.1:324 +#: ../dgit.1:376 msgid "" "Configure the current working tree the way that dgit clone would have set it " "up. Like running B<dgit setup-useremail>, B<setup-mergechangelogs> and " @@ -702,13 +813,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:324 +#: ../dgit.1:376 #, no-wrap msgid "B<dgit setup-useremail>" msgstr "" #. type: Plain text -#: ../dgit.1:330 +#: ../dgit.1:382 msgid "" "Set the working tree's user.name and user.email from the distro-specific " "dgit configuration (B<dgit-distro.>I<distro>B<.user-name> and B<.user-" @@ -716,26 +827,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:330 +#: ../dgit.1:382 #, no-wrap msgid "B<dgit setup-mergechangelogs>" msgstr "" #. type: Plain text -#: ../dgit.1:336 +#: ../dgit.1:388 msgid "" "Configures a git merge helper for the file B<debian/changelog> which uses " "B<dpkg-mergechangelogs>." msgstr "" #. type: TP -#: ../dgit.1:336 +#: ../dgit.1:388 #, no-wrap msgid "B<dgit setup-gitattributes>" msgstr "" #. type: Plain text -#: ../dgit.1:351 +#: ../dgit.1:403 msgid "" "Set up the working tree's B<.git/info/attributes> to disable all " "transforming attributes for all files. This is done by defining a macro " @@ -745,7 +856,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:359 +#: ../dgit.1:411 msgid "" "If there is an existing macro attribute line B<[attr]dgit-defuse-attrs> in ." "git/info/attributes, but it is insufficient, because it was made by an " @@ -754,7 +865,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:370 +#: ../dgit.1:422 msgid "" "(If there is already a macro attribute line B<[attr]dgit-defuse-attrs> in ." "git/info/attributes which does what dgit requires (whatever files it " @@ -764,13 +875,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:370 +#: ../dgit.1:422 #, no-wrap msgid "B<dgit quilt-fixup>" msgstr "" #. type: Plain text -#: ../dgit.1:377 +#: ../dgit.1:429 msgid "" "`3.0 (quilt)' format source packages need changes representing not only in-" "tree but also as patches in debian/patches. dgit quilt-fixup checks whether " @@ -779,12 +890,12 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:379 +#: ../dgit.1:431 msgid "This is normally done automatically by dgit build and dgit push." msgstr "" #. type: Plain text -#: ../dgit.1:385 +#: ../dgit.1:437 msgid "" "dgit will try to turn each relevant commit in your git history into a new " "quilt patch. dgit cannot convert nontrivial merges, or certain other kinds " @@ -794,7 +905,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:394 +#: ../dgit.1:446 msgid "" "When used with a git-debrebase branch, dgit will ask git-debrebase to " "prepare patches. However, dgit can make patches in some situations where " @@ -804,25 +915,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:399 +#: ../dgit.1:451 msgid "See B<FORMAT 3.0 (QUILT)> in B<dgit(7)>." msgstr "" #. type: TP -#: ../dgit.1:399 +#: ../dgit.1:451 #, no-wrap msgid "B<dgit import-dsc> [I<sub-options>] I<../path/to/.dsc> [B<+>|B<..>]branch" msgstr "" #. type: Plain text -#: ../dgit.1:405 +#: ../dgit.1:457 msgid "" "Import a Debian-format source package, specified by its .dsc, into git, the " "way dgit fetch would do." msgstr "" #. type: Plain text -#: ../dgit.1:416 +#: ../dgit.1:468 msgid "" "This does about half the work of dgit fetch: it will convert the .dsc into a " "new, orphan git branch. Since dgit has no access to a corresponding source " @@ -833,7 +944,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:426 +#: ../dgit.1:478 msgid "" "Because a .dsc can contain a Dgit field naming a git commit (which you might " "not have), and specifying where to find that commit (and any history rewrite " @@ -843,12 +954,12 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:428 +#: ../dgit.1:480 msgid "There is only one sub-option:" msgstr "" #. type: Plain text -#: ../dgit.1:434 +#: ../dgit.1:486 msgid "" "B<--require-valid-signature> causes dgit to insist that the signature on " "the .dsc is valid (using the same criteria as dpkg-source -x). Otherwise, " @@ -857,7 +968,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:453 +#: ../dgit.1:505 msgid "" "If I<branch> is prefixed with B<+> then if it already exists, it will be " "simply overwritten, no matter its existing contents. If I<branch> is " @@ -869,55 +980,55 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:457 +#: ../dgit.1:509 msgid "If I<branch> does not start with refs/, refs/heads/ is prepended." msgstr "" #. type: TP -#: ../dgit.1:457 +#: ../dgit.1:509 #, no-wrap msgid "B<dgit version>" msgstr "" #. type: Plain text -#: ../dgit.1:460 +#: ../dgit.1:512 msgid "Prints version information and exits." msgstr "" #. type: TP -#: ../dgit.1:460 +#: ../dgit.1:512 #, no-wrap msgid "B<dgit clone-dgit-repos-server>I< destdir>" msgstr "" #. type: Plain text -#: ../dgit.1:464 +#: ../dgit.1:516 msgid "" "Tries to fetch a copy of the source code for the dgit-repos-server, as " "actually being used on the dgit git server, as a git tree." msgstr "" #. type: TP -#: ../dgit.1:464 +#: ../dgit.1:516 #, no-wrap msgid "B<dgit print-dgit-repos-server-source-url>" msgstr "" #. type: Plain text -#: ../dgit.1:469 +#: ../dgit.1:521 msgid "" "Prints the url used by dgit clone-dgit-repos-server. This is hopefully " "suitable for use as a git remote url. It may not be useable in a browser." msgstr "" #. type: TP -#: ../dgit.1:469 +#: ../dgit.1:521 #, no-wrap msgid "B<dgit print-dpkg-source-ignores>" msgstr "" #. type: Plain text -#: ../dgit.1:476 +#: ../dgit.1:528 msgid "" "Prints the -i and -I arguments which must be passed to dpkg-souce to cause " "it to exclude exactly the .git directory and nothing else. The separate " @@ -925,13 +1036,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:476 +#: ../dgit.1:528 #, no-wrap msgid "B<dgit print-unapplied-treeish>" msgstr "" #. type: Plain text -#: ../dgit.1:487 +#: ../dgit.1:539 msgid "" "Constructs a tree-ish approximating the patches-unapplied state of your 3.0 " "(quilt) package, and prints the git object name to stdout. This requires " @@ -942,7 +1053,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:494 +#: ../dgit.1:546 msgid "" "To make this operate off-line, the access configuration key which is used to " "determine the build-products-dir is the uncanonicalised version of the suite " @@ -951,51 +1062,24 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:496 +#: ../dgit.1:548 msgid "This function is primarily provided for the benefit of git-debrebase." msgstr "" #. type: =head1 -#: ../dgit.1:496 ../git-debrebase.1.pod:477 +#: ../dgit.1:548 ../git-debrebase.1.pod:477 #, no-wrap msgid "OPTIONS" msgstr "" #. type: TP -#: ../dgit.1:497 -#, no-wrap -msgid "B<--dry-run> | B<-n>" -msgstr "" - -#. type: Plain text -#: ../dgit.1:503 -msgid "" -"Go through the motions, fetching all information needed, but do not actually " -"update the output(s). For push, dgit does the required checks and leaves " -"the new .dsc in a temporary file, but does not sign, tag, push or upload." -msgstr "" - -#. type: TP -#: ../dgit.1:503 -#, no-wrap -msgid "B<--damp-run> | B<-L>" -msgstr "" - -#. type: Plain text -#: ../dgit.1:508 -msgid "" -"Go through many more of the motions: do everything that doesn't involve " -"either signing things, or making changes on the public servers." -msgstr "" - -#. type: TP -#: ../dgit.1:508 +#: ../dgit.1:549 #, no-wrap msgid "B<-k>I<keyid>" msgstr "" #. type: Plain text -#: ../dgit.1:517 +#: ../dgit.1:558 msgid "" "Use I<keyid> for signing the tag and the upload. The default comes from the " "distro's B<keyid> config setting (see CONFIGURATION, below), or failing " @@ -1003,24 +1087,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:517 +#: ../dgit.1:558 #, no-wrap msgid "B<--no-sign>" msgstr "" #. type: Plain text -#: ../dgit.1:520 +#: ../dgit.1:561 msgid "does not sign tags or uploads (meaningful only with push)." msgstr "" #. type: TP -#: ../dgit.1:521 +#: ../dgit.1:562 #, no-wrap msgid "B<-p>I<package>" msgstr "" #. type: Plain text -#: ../dgit.1:527 +#: ../dgit.1:568 msgid "" "Specifies that we should process source package I<package> rather than " "looking in debian/control or debian/changelog. Valid with dgit fetch and " @@ -1028,27 +1112,27 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:527 +#: ../dgit.1:568 #, no-wrap msgid "B<--clean=git> | B<-wg>" msgstr "" #. type: Plain text -#: ../dgit.1:533 +#: ../dgit.1:574 msgid "" "Use B<git clean -xdf> to clean the working tree, rather than running the " "package's rules clean target." msgstr "" #. type: Plain text -#: ../dgit.1:536 +#: ../dgit.1:577 msgid "" "This will delete all files which are not tracked by git. (Including any " "files you forgot to git add.)" msgstr "" #. type: Plain text -#: ../dgit.1:541 +#: ../dgit.1:582 msgid "" "B<--clean=>I<...> options other than dpkg-source are useful when the " "package's clean target is troublesome, or to avoid needing the build-" @@ -1056,7 +1140,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:548 +#: ../dgit.1:589 msgid "" "dgit will only actually clean the tree if it needs to (because it needs to " "build the source package or binaries from your working tree). Otherwise it " @@ -1065,13 +1149,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:548 +#: ../dgit.1:589 #, no-wrap msgid "B<--clean=git-ff> | B<-wgf>" msgstr "" #. type: Plain text -#: ../dgit.1:557 +#: ../dgit.1:598 msgid "" "Use B<git clean -xdff> to clean the working tree. Like git clean -xdf but " "it also removes any subdirectories containing different git trees (which " @@ -1079,33 +1163,33 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:557 +#: ../dgit.1:598 #, no-wrap msgid "B<--clean=git>[B<-ff>]B<,always> | B<-wga> | B<-wgfa>" msgstr "" #. type: Plain text -#: ../dgit.1:561 +#: ../dgit.1:602 msgid "" "Like --clean=git, but always does the clean and not just a check, deleting " "any untracked un-ignored files." msgstr "" #. type: TP -#: ../dgit.1:561 +#: ../dgit.1:602 #, no-wrap msgid "B<--clean=check> | B<--clean=check,ignores> | B<-wc> | B<-wci>" msgstr "" #. type: Plain text -#: ../dgit.1:567 +#: ../dgit.1:608 msgid "" "Merely check that the tree is clean (does not contain uncommitted files). " "Avoids running rules clean, and can avoid needing the build-dependencies." msgstr "" #. type: Plain text -#: ../dgit.1:578 +#: ../dgit.1:619 msgid "" "With B<,ignores> or B<-wci>, untracked files covered by .gitignore are " "tolerated, so only files which show up as B<?> in git status (ie, ones you " @@ -1113,13 +1197,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:578 +#: ../dgit.1:619 #, no-wrap msgid "B<--clean=none> | B<-wn>" msgstr "" #. type: Plain text -#: ../dgit.1:586 +#: ../dgit.1:627 msgid "" "Do not clean the tree, nor check that it is clean. Avoids running rules " "clean, and can avoid needing the build-dependencies. If there are files " @@ -1128,13 +1212,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:586 +#: ../dgit.1:627 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>] | B<-wd> | B<-wdd>" msgstr "" #. type: Plain text -#: ../dgit.1:591 +#: ../dgit.1:632 msgid "" "Use dpkg-buildpackage to do the clean, so that the source package is cleaned " "by dpkg-source running the package's clean target. --clean=dpkg-source is " @@ -1142,12 +1226,12 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:595 +#: ../dgit.1:636 msgid "Without the extra B<d>, requires the package's build dependencies." msgstr "" #. type: Plain text -#: ../dgit.1:605 +#: ../dgit.1:646 msgid "" "With B<...>-d or B<-wdd>, the build-dependencies are not checked (due to " "passing B<-d> to dpkg-buildpackage), which violates policy, but may work in " @@ -1155,7 +1239,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:612 +#: ../dgit.1:653 msgid "" "The rules clean target will only be run if it is needed: when dgit is going " "to build source or binary packages from your working tree, rather than from " @@ -1164,7 +1248,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:622 +#: ../dgit.1:663 msgid "" "In all cases, dgit will check that there are (after rules clean, if " "applicable) no untracked un-ignored files, in case these are files you " @@ -1175,52 +1259,60 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:622 +#: ../dgit.1:663 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>]B<,no-check> | B<-wdn> | B<-wddn>" msgstr "" #. type: Plain text -#: ../dgit.1:626 +#: ../dgit.1:667 msgid "" "Like --clean=dpkg-source, but does not care about untracked un-ignored files." msgstr "" #. type: TP -#: ../dgit.1:626 +#: ../dgit.1:667 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>]B<,all-check> | B<-wda> | B<-wdda>" msgstr "" #. type: Plain text -#: ../dgit.1:631 +#: ../dgit.1:672 msgid "" "Like --clean=dpkg-source, but fails even on ignored untracked files. This " "could perhaps be used to detect bugs in your rules clean target." msgstr "" #. type: TP -#: ../dgit.1:631 +#: ../dgit.1:672 #, no-wrap msgid "B<-N> | B<--new>" msgstr "" #. type: Plain text -#: ../dgit.1:638 +#: ../dgit.1:678 +msgid "" +"The package is, or may be, new in this suite. Without this, dgit will " +"refuse to push. Needing --new is not unusual; for example, it is frequently " +"needed for uploading to Debian experimental." +msgstr "" + +#. type: Plain text +#: ../dgit.1:684 msgid "" -"The package is or may be new in this suite. Without this, dgit will refuse " -"to push. It may (for Debian, will) be unable to access the git history for " -"any packages which have been newly pushed and have not yet been published." +"Note that dgit may be unable to access the git history for an entirely new " +"package which has not been accepted by the archive. So for an entirely new " +"package you need to properly coordinate with anyone else who might upload." msgstr "" #. type: TP -#: ../dgit.1:638 +#: ../dgit.1:684 #, no-wrap msgid "B<--include-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:646 +#: ../dgit.1:692 msgid "" "Do not complain if the working tree does not match your git HEAD, and when " "building, include the changes from your working tree. This can be useful " @@ -1230,7 +1322,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:658 +#: ../dgit.1:704 msgid "" "Note that this does B<not> prevent dgit from cleaning your tree, so if the " "changes in your working tree are in the form of untracked files, those might " @@ -1241,24 +1333,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:658 +#: ../dgit.1:704 #, no-wrap msgid "B<--ignore-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:661 +#: ../dgit.1:707 msgid "Deprecated alias for --include-dirty." msgstr "" #. type: TP -#: ../dgit.1:661 +#: ../dgit.1:707 #, no-wrap msgid "B<--overwrite>[=I<previous-version>]" msgstr "" #. type: Plain text -#: ../dgit.1:672 +#: ../dgit.1:718 msgid "" "Declare that your HEAD really does contain all the (wanted) changes from all " "versions listed in its changelog; or, all (wanted) changes from I<previous-" @@ -1267,14 +1359,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:679 +#: ../dgit.1:725 msgid "" "It is safer not to specify I<previous-version>, and usually it's not " "needed. Just say B<--overwrite>, unless you know what you are doing." msgstr "" #. type: Plain text -#: ../dgit.1:685 +#: ../dgit.1:731 msgid "" "This option is useful if you are the maintainer, and you have incorporated " "NMU changes into your own git workflow in a way that doesn't make your " @@ -1283,14 +1375,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:691 +#: ../dgit.1:737 msgid "" "This option is also usually necessary the first time a package is pushed " "with dgit push to a particular suite. See B<dgit-maint->I<*>B<(7)>." msgstr "" #. type: Plain text -#: ../dgit.1:705 +#: ../dgit.1:751 msgid "" "If I<previous-version> is not specified, dgit will check that the version in " "the archive is mentioned in your debian/changelog. (This will avoid losing " @@ -1301,7 +1393,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:711 +#: ../dgit.1:757 msgid "" "dgit push --overwrite will, if necessary, make a pseudo-merge (that is, " "something that looks like the result of git merge -s ours) to stitch the " @@ -1310,7 +1402,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:716 +#: ../dgit.1:762 msgid "" "(In quilt mode B<gbp>, B<dpm>, B<unpatched> or B<baredebian>*, implying a " "split between the dgit view and the maintainer view, the pseudo-merge will " @@ -1318,18 +1410,18 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:716 +#: ../dgit.1:762 #, no-wrap msgid "B<--delayed>=I<days>" msgstr "" #. type: Plain text -#: ../dgit.1:719 +#: ../dgit.1:765 msgid "Upload to a DELAYED queue." msgstr "" #. type: Plain text -#: ../dgit.1:729 +#: ../dgit.1:775 msgid "" "B<WARNING:> If the maintainer responds by cancelling your upload from the " "queue, and does not make an upload of their own, this will not rewind the " @@ -1339,27 +1431,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:734 +#: ../dgit.1:780 msgid "" "If this situation arises, someone should make a suitable dgit push to update " "the contents of dgit-repos to a version without the controversial changes." msgstr "" #. type: TP -#: ../dgit.1:734 +#: ../dgit.1:780 #, no-wrap msgid "B<--no-chase-dsc-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:740 +#: ../dgit.1:786 msgid "" "Tells dgit not to look online for additional git repositories containing " "information about a particular .dsc being imported. Chasing is the default." msgstr "" #. type: Plain text -#: ../dgit.1:750 +#: ../dgit.1:796 msgid "" "For most operations (such as fetch and pull), disabling chasing means dgit " "will access only the git server for the distro you are directly working " @@ -1368,7 +1460,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:758 +#: ../dgit.1:804 msgid "" "Disabling chasing can be hazardous: if the .dsc names a git commit which has " "been rewritten by those in charge of the distro, this option may prevent " @@ -1377,13 +1469,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:758 +#: ../dgit.1:804 #, no-wrap msgid "B<--save-dgit-view=>I<branch>|I<ref>" msgstr "" #. type: Plain text -#: ../dgit.1:768 +#: ../dgit.1:814 msgid "" "Specifies that when split view is in operation, and dgit calculates (or " "looks up in its cache) a dgit view corresponding to your HEAD, the dgit " @@ -1392,7 +1484,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:772 +#: ../dgit.1:818 msgid "" "This option is effective only with the following operations: quilt-fixup; " "push; all builds. And it is only effective when split view is actually in " @@ -1400,25 +1492,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:776 +#: ../dgit.1:822 msgid "" "If ref does not start with refs/ it is taken to be a branch - i.e. refs/" "heads/ is prepended." msgstr "" #. type: Plain text -#: ../dgit.1:780 +#: ../dgit.1:826 msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view." msgstr "" #. type: TP -#: ../dgit.1:780 +#: ../dgit.1:826 #, no-wrap msgid "B<--deliberately->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:794 +#: ../dgit.1:840 msgid "" "Declare that you are deliberately doing I<something>. This can be used to " "override safety catches, including safety catches which relate to distro-" @@ -1430,13 +1522,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:794 +#: ../dgit.1:840 #, no-wrap msgid "B<--deliberately-not-fast-forward>" msgstr "" #. type: Plain text -#: ../dgit.1:800 +#: ../dgit.1:846 msgid "" "Declare that you are deliberately rewriting history. This could be because " "your branch is not fast forward from the dgit server history, or not fast " @@ -1444,7 +1536,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:806 +#: ../dgit.1:852 msgid "" "When pushing to Debian, use this only when you are making a renewed upload " "of an entirely new source package whose previous version was not accepted " @@ -1453,7 +1545,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:817 +#: ../dgit.1:863 msgid "" "When split view is in operation, this also prevents the construction by dgit " "of a pseudomerge to make the dgit view fast forwarding. Normally only one " @@ -1463,13 +1555,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:817 +#: ../dgit.1:863 #, no-wrap msgid "B<--deliberately-include-questionable-history>" msgstr "" #. type: Plain text -#: ../dgit.1:826 +#: ../dgit.1:872 msgid "" "Declare that you are deliberately including, in the git history of your " "current push, history which contains a previously-submitted version of this " @@ -1481,13 +1573,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:826 +#: ../dgit.1:872 #, no-wrap msgid "B<--deliberately-fresh-repo>" msgstr "" #. type: Plain text -#: ../dgit.1:831 +#: ../dgit.1:877 msgid "" "Declare that you are deliberately rewriting history and want to throw away " "the existing repo. Not relevant when pushing to Debian, as the Debian " @@ -1495,58 +1587,57 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:831 ../git-debpush.1.pod:114 +#: ../dgit.1:877 ../git-debpush.1.pod:114 #, no-wrap msgid "B<--quilt=linear>" msgstr "" #. type: Plain text -#: ../dgit.1:838 +#: ../dgit.1:884 msgid "" -"When fixing up source format `3.0 (quilt)' metadata, insist on generating a " -"linear patch stack: one new patch for each relevant commit. If such a stack " -"cannot be generated, fail. This is the default for Debian." +"With format `3.0 (quilt)', insist on a linear patch stack: one new patch for " +"each relevant commit. If such a stack cannot be generated, fail. This is " +"the default for Debian." msgstr "" #. type: Plain text -#: ../dgit.1:843 +#: ../dgit.1:889 msgid "" "HEAD should be a series of plain commits (not touching debian/patches/), and " "pseudomerges, with as ancestor a patches-applied branch." msgstr "" -#. type: =item -#: ../dgit.1:843 ../git-debpush.1.pod:126 +#. type: TP +#: ../dgit.1:889 #, no-wrap -msgid "B<--quilt=auto>" +msgid "B<--quilt=try-linear>" msgstr "" #. type: Plain text -#: ../dgit.1:852 +#: ../dgit.1:899 msgid "" -"When fixing up source format `3.0 (quilt)' metadata, prefer to generate a " -"linear patch stack (as with --quilt=linear) but if that doesn't seem " -"possible, try to generate a single squashed patch for all the changes made " -"in git (as with --quilt=smash). This is not a good idea for an NMU in " -"Debian." +"With format `3.0 (quilt)', prefer a linear patch stack (as with --" +"quilt=linear) but if that doesn't seem possible, try to generate a single " +"squashed patch for all the changes made in git (as with --quilt=smash). " +"This is not a good idea for an NMU in Debian." msgstr "" #. type: =item -#: ../dgit.1:852 ../git-debpush.1.pod:120 +#: ../dgit.1:899 ../git-debpush.1.pod:120 #, no-wrap msgid "B<--quilt=smash>" msgstr "" #. type: Plain text -#: ../dgit.1:857 +#: ../dgit.1:905 msgid "" -"When fixing up source format `3.0 (quilt)' metadata, generate a single " -"additional patch for all the changes made in git. This is not a good idea " -"for an NMU in Debian." +"With format `3.0 (quilt)', assume patches-applied (as obtained from dgit " +"clone) and generate a single additional patch for all the changes made in " +"git. This is not a good idea for an NMU in Debian." msgstr "" #. type: Plain text -#: ../dgit.1:863 +#: ../dgit.1:911 msgid "" "(If HEAD has any in-tree patches already, they must apply cleanly. This " "will be the case for any trees produced by dgit fetch or clone; if you do " @@ -1554,57 +1645,84 @@ msgid "" "remain true.)" msgstr "" +#. type: TP +#: ../dgit.1:911 +#, no-wrap +msgid "B<--quilt=single>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:918 +msgid "" +"With format `3.0 (quilt)', assume patches-applied (as obtained from dgit " +"clone), delete all the existing patches, and then generate a single patch " +"for all the changes made in git. This is not a good idea for an NMU in " +"Debian." +msgstr "" + +#. type: Plain text +#: ../dgit.1:927 +msgid "" +"Use this instead of the B<single-debian-patch> dpkg-source format option. " +"That dpkg-source option cannot handle certain changes to the tree that dpkg-" +"source otherwise permits, and in some cases it can generate strange source " +"packages that dpkg-source appears to accept but which become corrupted when " +"people later try to modify them." +msgstr "" + #. type: =item -#: ../dgit.1:863 ../git-debpush.1.pod:131 +#: ../dgit.1:927 ../git-debpush.1.pod:131 #, no-wrap msgid "B<--quilt=nofix>" msgstr "" #. type: Plain text -#: ../dgit.1:871 +#: ../dgit.1:937 msgid "" -"Check whether source format `3.0 (quilt)' metadata would need fixing up, " -"but, if it does, fail. You must then fix the metadata yourself somehow " -"before pushing. (NB that dpkg-source --commit will not work because the " -"dgit git tree does not have a B<.pc> directory.)" +"With format `3.0 (quilt)', assume patches-applied (as obtained from dgit " +"clone), and check that the patch metadata is up to date. If it isn't, fail; " +"you must then fix the metadata yourself somehow before pushing. (NB that " +"dpkg-source --commit will not work because the dgit git tree does not have a " +"B<.pc> directory.)" msgstr "" #. type: TP -#: ../dgit.1:871 +#: ../dgit.1:937 #, no-wrap msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>" msgstr "" #. type: Plain text -#: ../dgit.1:876 +#: ../dgit.1:944 msgid "" -"Do not check whether source format `3.0 (quilt)' metadata needs fixing up. " -"If you use this option and the metadata did in fact need fixing up, dgit " +"With format `3.0 (quilt)', assume that the tree is patches-applied (as " +"obtained from dgit clone), and I<assume> that the patch metadata is up to " +"date. If you use this option and the patch metadata is out of date, dgit " "push will fail." msgstr "" #. type: TP -#: ../dgit.1:876 +#: ../dgit.1:944 #, no-wrap msgid "B<-->[B<quilt=>]B<gbp> | B<-->[B<quilt=>]B<dpm> | B<--quilt=unapplied> | B<-->[B<quilt=>]B<baredebian>[B<+git>|B<+tarball>]" msgstr "" #. type: Plain text -#: ../dgit.1:883 +#: ../dgit.1:951 msgid "" "Tell dgit that you are using a nearly-dgit-compatible git branch, aka a " "B<maintainer view>, and do not want your branch changed by dgit." msgstr "" #. type: Plain text -#: ../dgit.1:887 +#: ../dgit.1:955 msgid "" "These quilt modes are known as B<splitting quilt modes>. See --split-view, " "below." msgstr "" #. type: Plain text -#: ../dgit.1:895 +#: ../dgit.1:963 msgid "" "B<--gbp> (short for B<--quilt=gbp>) is for use with git-buildpackage. Your " "HEAD is expected to be a patches-unapplied git branch, except that it might " @@ -1613,7 +1731,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:903 +#: ../dgit.1:971 msgid "" "B<--dpm> (short for B<--quilt=dpm>) is for use with git-dpm. Your HEAD is " "expected to be a patches-applied git branch, except that it might contain " @@ -1621,7 +1739,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:908 +#: ../dgit.1:976 msgid "" "B<--quilt=unapplied> specifies that your HEAD is a patches-unapplied git " "branch (and that any changes to upstream .gitignore files are represented as " @@ -1629,7 +1747,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:922 +#: ../dgit.1:990 msgid "" "B<--quilt=baredebian> (or its alias B<--quilt=baredebian+git>) specifies " "that your HEAD contains only a debian/ directory, with any changes to " @@ -1641,7 +1759,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:933 +#: ../dgit.1:1001 msgid "" "B<--quilt=baredebian+tarball> is like --quilt=baredebian, but is used when " "there is no appropriate upstream git history. To construct the dgit view, " @@ -1652,7 +1770,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:951 +#: ../dgit.1:1019 msgid "" "With --quilt=gbp|dpm|unapplied|baredebian*, dgit push (or precursors like " "quilt-fixup and build) will automatically generate a conversion of your git " @@ -1666,7 +1784,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:960 +#: ../dgit.1:1028 msgid "" "B<If you have a branch like this it is essential to specify the appropriate " "--quilt= option!> This is because it is not always possible to tell: a " @@ -1678,13 +1796,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:960 +#: ../dgit.1:1028 #, no-wrap msgid "B<-d>I<distro> | B<--distro=>I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:969 +#: ../dgit.1:1037 msgid "" "Specifies that the suite to be operated on is part of distro I<distro>. " "This overrides the default value found from the git config option B<dgit-" @@ -1694,7 +1812,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:975 +#: ../dgit.1:1043 msgid "" "If your suite is part of a distro that dgit already knows about, you can use " "this option to make dgit work even if your dgit doesn't know about the " @@ -1703,7 +1821,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:980 +#: ../dgit.1:1048 msgid "" "To define a new distro it is necessary to define methods and URLs for " "fetching (and, for dgit push, altering) a variety of information both in the " @@ -1711,20 +1829,20 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:980 +#: ../dgit.1:1048 #, no-wrap msgid "B<--split-view=auto>|B<always>|B<never>" msgstr "" #. type: Plain text -#: ../dgit.1:985 +#: ../dgit.1:1053 msgid "" "Controls whether dgit operates a split view, separating your own branch (as " "Debian maintainer) from that shown to users of dgit clone and dgit fetch." msgstr "" #. type: Plain text -#: ../dgit.1:993 +#: ../dgit.1:1061 msgid "" "When split view is in operation dgit will not make or merge any commits onto " "your own branch. Specifically, only the dgit view will contain dgit's " @@ -1734,7 +1852,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:999 +#: ../dgit.1:1067 msgid "" "B<auto> is the default, and splits the view only when needed: i.e., when you " "are working with a `3.0 (quilt)' source package and a splitting quilt mode: " @@ -1742,18 +1860,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1002 +#: ../dgit.1:1070 msgid "" "B<always> splits the view regardless of the source format and the quilt mode." msgstr "" #. type: Plain text -#: ../dgit.1:1005 +#: ../dgit.1:1073 msgid "B<never> will cause dgit to fail if split view is needed." msgstr "" #. type: Plain text -#: ../dgit.1:1013 +#: ../dgit.1:1081 msgid "" "When split view is in operation, the dgit view is visible in your local git " "clone, but only in refs specific to dgit: notably B<remotes/dgit/dgit/" @@ -1761,20 +1879,20 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1016 +#: ../dgit.1:1084 msgid "" "Note that split view does not affect dgit fetch, and is not compatible with " "dgit pull." msgstr "" #. type: TP -#: ../dgit.1:1016 +#: ../dgit.1:1084 #, no-wrap msgid "B<-C>I<changesfile>" msgstr "" #. type: Plain text -#: ../dgit.1:1021 +#: ../dgit.1:1089 msgid "" "Specifies the .changes file which is to be uploaded. By default dgit push " "looks for a single .changes file in the parent directory whose filename " @@ -1782,7 +1900,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1030 +#: ../dgit.1:1098 msgid "" "If the specified I<changesfile> pathname contains slashes, the directory " "part is also used as the value for B<--build-products-dir>; otherwise, the " @@ -1790,13 +1908,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1030 +#: ../dgit.1:1098 #, no-wrap msgid "B<--upstream-commitish=>I<upstream>" msgstr "" #. type: Plain text -#: ../dgit.1:1038 +#: ../dgit.1:1106 msgid "" "For use with --quilt=baredebian only. Specifies the commit containing the " "upstream source. This commit must be identical to your .orig tarball. The " @@ -1805,13 +1923,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1038 +#: ../dgit.1:1106 #, no-wrap msgid "B<--rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1050 +#: ../dgit.1:1118 msgid "" "When doing a build, delete any changes files matching " "I<package>B<_>I<version>B<_*.changes> before starting. This ensures that " @@ -1823,32 +1941,32 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1053 +#: ../dgit.1:1121 msgid "" "Note that B<dgit push-source> will always find the right .changes, " "regardless of this option." msgstr "" #. type: TP -#: ../dgit.1:1053 +#: ../dgit.1:1121 #, no-wrap msgid "B<--build-products-dir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:1057 +#: ../dgit.1:1125 msgid "" "Specifies where to find and create tarballs, binary packages, source " "packages, .changes files, and so on." msgstr "" #. type: Plain text -#: ../dgit.1:1060 +#: ../dgit.1:1128 msgid "By default, dgit uses the parent directory (B<..>)." msgstr "" #. type: Plain text -#: ../dgit.1:1069 +#: ../dgit.1:1137 msgid "" "Changing this setting may necessitate moving .orig tarballs to the new " "directory, so it is probably best to use the B<dgit.default.build-products-" @@ -1857,85 +1975,85 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1069 +#: ../dgit.1:1137 #, no-wrap msgid "B<--no-rm-on-error>" msgstr "" #. type: Plain text -#: ../dgit.1:1072 +#: ../dgit.1:1140 msgid "Do not delete the destination directory if clone fails." msgstr "" #. type: TP -#: ../dgit.1:1072 +#: ../dgit.1:1140 #, no-wrap msgid "B<--dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1079 +#: ../dgit.1:1147 msgid "" "Generates a DEP-14 tag (eg B<debian/>I<version>) as well as a dgit tag (eg " "B<archive/debian/>I<version>). This is the default." msgstr "" #. type: TP -#: ../dgit.1:1079 +#: ../dgit.1:1147 #, no-wrap msgid "B<--no-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1082 +#: ../dgit.1:1150 msgid "Do not generate a DEP-14 tag, except when split view is in operation." msgstr "" #. type: TP -#: ../dgit.1:1082 +#: ../dgit.1:1150 #, no-wrap msgid "B<--always-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1085 +#: ../dgit.1:1153 msgid "Obsolete alias for --dep14tag, retained for compatibility." msgstr "" #. type: TP -#: ../dgit.1:1085 +#: ../dgit.1:1153 #, no-wrap msgid "B<-D>" msgstr "" #. type: Plain text -#: ../dgit.1:1089 +#: ../dgit.1:1157 msgid "" "Prints debugging information to stderr. Repeating the option produces more " "output (currently, up to -DDDD is meaningfully different)." msgstr "" #. type: TP -#: ../dgit.1:1089 +#: ../dgit.1:1157 #, no-wrap msgid "B<-c>I<name>B<=>I<value>" msgstr "" #. type: Plain text -#: ../dgit.1:1093 +#: ../dgit.1:1161 msgid "" "Specifies a git configuration option, to be used for this run. dgit itself " "is also controlled by git configuration options." msgstr "" #. type: TP -#: ../dgit.1:1093 +#: ../dgit.1:1161 #, no-wrap msgid "B<-v>I<version>|B<_> | B<--since-version=>versionI<|>B<_>" msgstr "" #. type: Plain text -#: ../dgit.1:1102 +#: ../dgit.1:1170 msgid "" "Specifies the B<-v>I<version> option to pass to dpkg-genchanges, during " "builds. Changes (from debian/changelog) since this version will be included " @@ -1945,7 +2063,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1108 +#: ../dgit.1:1176 msgid "" "Specifying B<_> inhibits this, so that no -v option will be passed to dpkg-" "genchanges (and as a result, only the last stanza from debian/changelog will " @@ -1953,30 +2071,30 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1108 +#: ../dgit.1:1176 #, no-wrap msgid "B<-m>I<maintaineraddress>" msgstr "" #. type: Plain text -#: ../dgit.1:1111 +#: ../dgit.1:1179 msgid "Passed to dpkg-genchanges (eventually)." msgstr "" #. type: TP -#: ../dgit.1:1111 +#: ../dgit.1:1179 #, no-wrap msgid "B<--ch:>I<option>" msgstr "" #. type: Plain text -#: ../dgit.1:1115 +#: ../dgit.1:1183 msgid "" "Specifies a single additional option to pass, eventually, to dpkg-genchanges." msgstr "" #. type: Plain text -#: ../dgit.1:1122 +#: ../dgit.1:1190 msgid "" "Options which are safe to pass include B<-C> (and also B<-si -sa -sd> " "although these should never be necessary with Debian since dgit " @@ -1984,18 +2102,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1124 +#: ../dgit.1:1192 msgid "For other options the caveat below applies." msgstr "" #. type: TP -#: ../dgit.1:1124 +#: ../dgit.1:1192 #, no-wrap msgid "B<--curl:>I<option> | B<--dput:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1146 +#: ../dgit.1:1214 msgid "" "Specifies a single additional option to pass to B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -2005,7 +2123,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1154 +#: ../dgit.1:1222 msgid "" "Use of this ability should not normally be necessary. It is provided for " "working around bugs, or other unusual situations. If you use these options, " @@ -2014,7 +2132,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1159 +#: ../dgit.1:1227 msgid "" "For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild, the option " "applies only when the program is invoked directly by dgit. Usually, for " @@ -2022,7 +2140,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1163 +#: ../dgit.1:1231 msgid "" "Specifying --git is not effective for some lower-level read-only git " "operations performed by dgit, and also not when git is invoked by another " @@ -2030,39 +2148,39 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1165 +#: ../dgit.1:1233 msgid "See notes below regarding ssh and dgit." msgstr "" #. type: Plain text -#: ../dgit.1:1173 +#: ../dgit.1:1241 msgid "" "NB that --gpg:option is not supported (because debsign does not have that " "facility). But see B<-k> and the B<keyid> distro config setting." msgstr "" #. type: TP -#: ../dgit.1:1173 +#: ../dgit.1:1241 #, no-wrap msgid "B<--curl!:>I<option> | B<--dput!:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1179 +#: ../dgit.1:1247 msgid "" "Specifies an option to remove from the command line for a program called by " "dgit, as for B<-->I<program>B<:>I<option> (and the same caveats apply)." msgstr "" #. type: Plain text -#: ../dgit.1:1184 +#: ../dgit.1:1252 msgid "" "Any options or arguments exactly identical to I<option> are removed. (It is " "not an error if there were none.)" msgstr "" #. type: Plain text -#: ../dgit.1:1191 +#: ../dgit.1:1259 msgid "" "This can only be used to delete options which are always passed by default " "by dgit, or to undo a previous B<-->I<program>B<:>I<option>. It cannot be " @@ -2070,13 +2188,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1191 +#: ../dgit.1:1259 #, no-wrap msgid "B<--curl=>I<program> | B<--dput=>I<program> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1214 +#: ../dgit.1:1282 msgid "" "Specifies alternative programs to use instead of B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -2086,14 +2204,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1222 +#: ../dgit.1:1290 msgid "" "For B<dpkg-buildpackage>, B<dpkg-genchanges>, B<mergechanges> and B<sbuild>, " "this applies only when the program is invoked directly by dgit." msgstr "" #. type: Plain text -#: ../dgit.1:1229 +#: ../dgit.1:1297 msgid "" "For B<dgit>, specifies the command to run on the remote host when dgit rpush " "needs to invoke a remote copy of itself. (dgit also reinvokes itself as the " @@ -2102,7 +2220,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1240 +#: ../dgit.1:1308 msgid "" "B<gbp-build>'s value is used instead of gbp build or git-buildpackage. (The " "default is the latter unless the former exists on PATH.) B<gbp-pq>'s value " @@ -2112,7 +2230,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1248 +#: ../dgit.1:1316 msgid "" "For pbuilder and cowbuilder, the defaults are B<sudo -E pbuilder> and B<sudo " "-E cowbuilder> respectively. Like with gbp-build and gbp pq, the specified " @@ -2120,7 +2238,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1265 +#: ../dgit.1:1333 msgid "" "For B<ssh>, the default value is taken from the B<DGIT_SSH> or B<GIT_SSH> " "environment variables, if set (see below). And, for ssh, when accessing the " @@ -2132,13 +2250,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1265 +#: ../dgit.1:1333 #, no-wrap msgid "B<--existing-package=>I<package>" msgstr "" #. type: Plain text -#: ../dgit.1:1275 +#: ../dgit.1:1343 msgid "" "dgit push needs to canonicalise the suite name. Sometimes, dgit lacks a way " "to ask the archive to do this without knowing the name of an existing " @@ -2149,19 +2267,19 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1275 +#: ../dgit.1:1343 #, no-wrap msgid "B<-h>|B<--help>" msgstr "" #. type: TP -#: ../dgit.1:1278 +#: ../dgit.1:1346 #, no-wrap msgid "B<--initiator-tempdir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:1287 +#: ../dgit.1:1355 msgid "" "dgit rpush uses a temporary directory on the invoking (signing) host. This " "option causes dgit to use I<directory> instead. Furthermore, the specified " @@ -2171,13 +2289,55 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1287 +#: ../dgit.1:1355 +#, no-wrap +msgid "B<--dry-run> | B<-n>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1361 +msgid "" +"Go through the motions, fetching all information needed, but do not actually " +"update the output(s). For push, dgit does the required checks and leaves " +"the new .dsc in a temporary file, but does not sign, tag, push or upload." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1364 +msgid "" +"This is not a very good simulation. It can easily go wrong in ways that a " +"for-real push wouldn't." +msgstr "" + +#. type: TP +#: ../dgit.1:1364 +#, no-wrap +msgid "B<--damp-run> | B<-L>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1369 +msgid "" +"Go through many more of the motions: do everything that doesn't involve " +"either signing things, or making changes on the public servers." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1374 +msgid "" +"Using this will make unsigned tags, and possibly other local changes, that " +"will get in the way of a for-real push. So be prepared to burn the version " +"number you're using." +msgstr "" + +#. type: TP +#: ../dgit.1:1374 #, no-wrap msgid "B<--force->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:1295 +#: ../dgit.1:1382 msgid "" "Instructs dgit to try to proceed despite detecting what it thinks is going " "to be a fatal problem. B<This is probably not going to work.> These options " @@ -2186,13 +2346,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1295 +#: ../dgit.1:1382 #, no-wrap msgid "B<--force-import-dsc-with-dgit-field>" msgstr "" #. type: Plain text -#: ../dgit.1:1302 +#: ../dgit.1:1389 msgid "" "Tell dgit import-dsc to treat a .dsc with a Dgit field like one without it. " "The result is a fresh import, discarding the git history that the person who " @@ -2200,13 +2360,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1302 +#: ../dgit.1:1389 #, no-wrap msgid "B<--force-reusing-version>" msgstr "" #. type: Plain text -#: ../dgit.1:1309 +#: ../dgit.1:1396 msgid "" "Carry on even though this involves reusing a version number of a previous " "push or upload. It is normally best to give different versions different " @@ -2215,26 +2375,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1309 +#: ../dgit.1:1396 #, no-wrap msgid "B<--force-uploading-binaries>" msgstr "" #. type: Plain text -#: ../dgit.1:1314 +#: ../dgit.1:1401 msgid "" "Carry on and upload binaries even though dgit thinks your distro does not " "permit that." msgstr "" #. type: TP -#: ../dgit.1:1314 +#: ../dgit.1:1401 #, no-wrap msgid "B<--force-uploading-source-only>" msgstr "" #. type: Plain text -#: ../dgit.1:1320 +#: ../dgit.1:1407 msgid "" "Carry on and do a source-only upload, without any binaries, even though dgit " "thinks your distro does not permit that, or does not permit that in this " @@ -2242,13 +2402,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1320 +#: ../dgit.1:1407 #, no-wrap msgid "B<--force-unrepresentable>" msgstr "" #. type: Plain text -#: ../dgit.1:1327 +#: ../dgit.1:1414 msgid "" "Carry on even if dgit thinks that your git tree contains changes (relative " "to your .orig tarballs) which dpkg-source is not able to represent. Your " @@ -2256,65 +2416,81 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1327 +#: ../dgit.1:1414 #, no-wrap msgid "B<--force-changes-origs-exactly>" msgstr "" #. type: Plain text -#: ../dgit.1:1332 +#: ../dgit.1:1419 msgid "" "Use the set of .origs specified in your .changes, exactly, without regard to " "what is in the archive already. The archive may well reject your upload." msgstr "" #. type: TP -#: ../dgit.1:1332 +#: ../dgit.1:1419 #, no-wrap msgid "B<--force-unsupported-source-format>" msgstr "" #. type: Plain text -#: ../dgit.1:1336 +#: ../dgit.1:1423 msgid "" "Carry on despite dgit not understanding your source package format. dgit " "will probably mishandle it." msgstr "" #. type: TP -#: ../dgit.1:1336 +#: ../dgit.1:1423 #, no-wrap msgid "B<--force-dsc-changes-mismatch>" msgstr "" #. type: Plain text -#: ../dgit.1:1340 +#: ../dgit.1:1427 msgid "" "Do not check whether .dsc and .changes match. The archive will probably " "reject your upload." msgstr "" #. type: TP -#: ../dgit.1:1340 +#: ../dgit.1:1427 #, no-wrap msgid "B<--force-import-gitapply-absurd> | B<--force-import-gitapply-no-absurd>" msgstr "" #. type: Plain text -#: ../dgit.1:1346 +#: ../dgit.1:1433 msgid "" "Force on or off the use of the absurd git-apply emulation when running gbp " "pq import when importing a package from a .dsc. See Debian bug #841867." msgstr "" #. type: TP -#: ../dgit.1:1346 +#: ../dgit.1:1433 +#, no-wrap +msgid "B<--force-push-tainted>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1443 +msgid "" +"Go ahead and try to push even tainted git objects hat the server says it is " +"going to reject, but without declaring any --deliberately. This option is " +"provided for testing or strange situations, and is not the way to override " +"the taint check: using it will probably just fail later, burning the version " +"number you are using. Use the appropriate --deliberately option instead." +msgstr "" + +#. type: TP +#: ../dgit.1:1443 #, no-wrap msgid "B<--for-push>" msgstr "" #. type: Plain text -#: ../dgit.1:1352 +#: ../dgit.1:1449 msgid "" "Override the dgit-distro.distro.readonly configuration setting, to specify " "that we have read/write access and should use the corresponding git and " @@ -2322,13 +2498,13 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1352 ../dgit-downstream-dsc.7.pod:150 +#: ../dgit.1:1449 ../dgit-downstream-dsc.7.pod:150 #, no-wrap msgid "CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1358 +#: ../dgit.1:1455 msgid "" "dgit can be configured via the git config system. You may set keys with git-" "config (either in system-global or per-tree configuration), or provide B<-" @@ -2336,31 +2512,31 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1360 +#: ../dgit.1:1457 msgid "Settings likely to be useful for an end user include:" msgstr "" #. type: TP -#: ../dgit.1:1360 +#: ../dgit.1:1457 #, no-wrap msgid "B<dgit.default.build-products-dir>" msgstr "" #. type: Plain text -#: ../dgit.1:1366 +#: ../dgit.1:1463 msgid "" "Specifies where to find the built files to be uploaded, when --build-" "products-dir is not specified. The default is the parent directory (B<..>)." msgstr "" #. type: =item -#: ../dgit.1:1366 ../dgit-downstream-dsc.7.pod:286 +#: ../dgit.1:1463 ../dgit-downstream-dsc.7.pod:286 #, no-wrap msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1371 +#: ../dgit.1:1468 msgid "" "Specifies the distro for a suite. dgit keys off the suite name (which " "appears in changelogs etc.), and uses that to determine the distro which is " @@ -2368,73 +2544,73 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1374 +#: ../dgit.1:1471 msgid "I<suite> may be a glob pattern." msgstr "" #. type: TP -#: ../dgit.1:1374 +#: ../dgit.1:1471 #, no-wrap msgid "B<dgit.default.distro>I< distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1377 +#: ../dgit.1:1474 msgid "The default distro for an unknown suite." msgstr "" #. type: Plain text -#: ../dgit.1:1381 +#: ../dgit.1:1478 msgid "" "This is only used if no B</usr/share/distro-info/>I<somedistro>B<.csv> " "mentions the specified suite." msgstr "" #. type: TP -#: ../dgit.1:1381 +#: ../dgit.1:1478 #, no-wrap msgid "B<dgit.default.default-suite>I< suite>" msgstr "" #. type: Plain text -#: ../dgit.1:1384 +#: ../dgit.1:1481 msgid "The default suite (eg for clone)." msgstr "" #. type: TP -#: ../dgit.1:1384 +#: ../dgit.1:1481 #, no-wrap msgid "B<dgit.default.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1389 +#: ../dgit.1:1486 msgid "" "for each B<dgit-distro.>I<distro>B<.>*, the default value used if there is " "no distro-specific setting." msgstr "" #. type: TP -#: ../dgit.1:1389 +#: ../dgit.1:1486 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1393 +#: ../dgit.1:1490 msgid "" "One of the values for the command line --clean= option; used if --clean is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1393 +#: ../dgit.1:1490 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode-newer>" msgstr "" #. type: Plain text -#: ../dgit.1:1399 +#: ../dgit.1:1496 msgid "" "Like .clean-mode, but ignored if the value is unknown to this version of " "dgit. Setting both .clean-mode and .clean-mode-newer is useful to provide a " @@ -2442,45 +2618,45 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1399 +#: ../dgit.1:1496 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.quilt-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1403 +#: ../dgit.1:1500 msgid "" "One of the values for the command line --quilt= option; used if --quilt is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1403 +#: ../dgit.1:1500 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.split-view>" msgstr "" #. type: TP -#: ../dgit.1:1405 +#: ../dgit.1:1502 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1409 +#: ../dgit.1:1506 msgid "" "Boolean, used if neither --rm-old-changes nor --no-rm-old-changes is " "specified. The default is not to remove." msgstr "" #. type: TP -#: ../dgit.1:1409 +#: ../dgit.1:1506 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.readonly> B<auto>|B<a> | B<true>|B<t>|B<y>|B<1> | B<false>|B<f>|B<n>|B<0>" msgstr "" #. type: Plain text -#: ../dgit.1:1416 +#: ../dgit.1:1513 msgid "" "Whether you have push access to the distro. For Debian, it is OK to use " "auto, which uses readonly mode if you are not pushing right now; but, " @@ -2489,52 +2665,52 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1416 +#: ../dgit.1:1513 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.keyid>" msgstr "" #. type: Plain text -#: ../dgit.1:1420 +#: ../dgit.1:1517 msgid "See also B<-k>." msgstr "" #. type: TP -#: ../dgit.1:1420 +#: ../dgit.1:1517 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.mirror>I< url>" msgstr "" #. type: TP -#: ../dgit.1:1422 +#: ../dgit.1:1519 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.username>" msgstr "" #. type: Plain text -#: ../dgit.1:1425 +#: ../dgit.1:1522 msgid "Not relevant for Debian." msgstr "" #. type: =item -#: ../dgit.1:1425 ../dgit-downstream-dsc.7.pod:242 +#: ../dgit.1:1522 ../dgit-downstream-dsc.7.pod:242 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.upload-host>" msgstr "" #. type: Plain text -#: ../dgit.1:1428 +#: ../dgit.1:1525 msgid "Might be useful if you have an intermediate queue server." msgstr "" #. type: TP -#: ../dgit.1:1428 +#: ../dgit.1:1525 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.user-name>I< >B<dgit-distro.>I<distro>B<.user-email>" msgstr "" #. type: Plain text -#: ../dgit.1:1433 +#: ../dgit.1:1530 msgid "" "Values to configure for user.name and user.email in new git trees. If not " "specified, the DEBFULLNAME and DEBEMAIL environment variables are used, " @@ -2542,26 +2718,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1433 +#: ../dgit.1:1530 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-useremail>" msgstr "" #. type: Plain text -#: ../dgit.1:1437 +#: ../dgit.1:1534 msgid "" "Whether to set user.name and user.email in new git trees. True by default. " "Ignored for dgit setup-useremail, which does it anyway." msgstr "" #. type: TP -#: ../dgit.1:1437 +#: ../dgit.1:1534 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-mergechangelogs>" msgstr "" #. type: Plain text -#: ../dgit.1:1442 +#: ../dgit.1:1539 msgid "" "Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/" "changelog. True by default. Ignored for dgit setup-mergechangelogs, which " @@ -2569,13 +2745,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1442 +#: ../dgit.1:1539 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-gitattributes>" msgstr "" #. type: Plain text -#: ../dgit.1:1448 +#: ../dgit.1:1545 msgid "" "Whether to configure .git/info/attributes to suppress checkin/checkout file " "content transformations in new git trees. True by default. Ignored for " @@ -2583,24 +2759,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1448 +#: ../dgit.1:1545 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.cmd->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1454 +#: ../dgit.1:1551 msgid "Program to use instead of I<cmd>. Works like B<-->I<cmd>B<=>... ." msgstr "" #. type: TP -#: ../dgit.1:1454 +#: ../dgit.1:1551 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1466 +#: ../dgit.1:1563 msgid "" "Extra options to pass to I<cmd>. Works like B<-->I<cmd>B<:>... . To pass " "several options, configure multiple values in git config (with git config --" @@ -2610,13 +2786,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1466 +#: ../dgit.1:1563 #, no-wrap msgid "ACCESS CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1471 +#: ../dgit.1:1568 msgid "" "There are many other settings which specify how a particular distro's " "services (archive and git) are provided. These should not normally be " @@ -2625,204 +2801,215 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1471 +#: ../dgit.1:1568 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.nominal-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1474 +#: ../dgit.1:1571 msgid "Shown in git tags, Dgit fields, and so on." msgstr "" #. type: TP -#: ../dgit.1:1474 +#: ../dgit.1:1571 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.alias-canon>" msgstr "" #. type: Plain text -#: ../dgit.1:1477 +#: ../dgit.1:1574 msgid "Used for all access configuration lookup." msgstr "" #. type: TP -#: ../dgit.1:1477 +#: ../dgit.1:1574 #, no-wrap msgid "B<dgit-distro.>I<distro>B</push.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1483 +#: ../dgit.1:1580 msgid "" "If set, overrides corresponding non B</push> config when B<readonly=false>, " "or when pushing and B<readonly=auto>." msgstr "" #. type: TP -#: ../dgit.1:1483 +#: ../dgit.1:1580 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>" msgstr "" #. type: TP -#: ../dgit.1:1485 +#: ../dgit.1:1582 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]" msgstr "" #. type: TP -#: ../dgit.1:1487 +#: ../dgit.1:1584 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-proto>" msgstr "" #. type: TP -#: ../dgit.1:1489 +#: ../dgit.1:1586 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-path>" msgstr "" #. type: TP -#: ../dgit.1:1491 +#: ../dgit.1:1588 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check> B<true>|B<false>|B<url>|B<ssh-cmd>" msgstr "" #. type: TP -#: ../dgit.1:1493 +#: ../dgit.1:1590 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1495 +#: ../dgit.1:1592 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.policy-query-supported-ssh>I< >B<false>I<|>B<unknown>I<|>B<true>" +msgstr "" + +#. type: TP +#: ../dgit.1:1594 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1497 +#: ../dgit.1:1596 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>" msgstr "" #. type: TP -#: ../dgit.1:1499 +#: ../dgit.1:1598 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query> B<ftpmasterapi:> | B<madison:>I<distro> | B<dummycat:>I</path> | B<sshpsql:>I<user>B<@>I<host>B<:>I<dbname>B< >|B< aptget:>" msgstr "" #. type: TP -#: ../dgit.1:1501 +#: ../dgit.1:1600 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query->(B<url>|B<tls-key>|B<curl-ca-args>)" msgstr "" #. type: TP -#: ../dgit.1:1503 +#: ../dgit.1:1602 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.madison-distro>" msgstr "" #. type: TP -#: ../dgit.1:1505 +#: ../dgit.1:1604 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>" msgstr "" #. type: TP -#: ../dgit.1:1507 -#, no-wrap -msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>" -msgstr "" - -#. type: TP -#: ../dgit.1:1509 +#: ../dgit.1:1606 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>[|B<always>]" msgstr "" #. type: TP -#: ../dgit.1:1511 +#: ../dgit.1:1608 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.ssh>" msgstr "" #. type: TP -#: ../dgit.1:1513 +#: ../dgit.1:1610 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>" msgstr "" #. type: TP -#: ../dgit.1:1515 +#: ../dgit.1:1612 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.>(B<git>|B<sshpsql>)B<->(B<user>|B<host>|B<user-force>)" msgstr "" #. type: TP -#: ../dgit.1:1517 +#: ../dgit.1:1614 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.backports-quirk>" msgstr "" #. type: TP -#: ../dgit.1:1519 +#: ../dgit.1:1616 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>" msgstr "" #. type: TP -#: ../dgit.1:1521 +#: ../dgit.1:1618 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.source-only-uploads> B<ok>|B<always>|B<never>|B<not-wholly-new>" msgstr "" #. type: TP -#: ../dgit.1:1523 +#: ../dgit.1:1620 #, no-wrap msgid "B<dgit.default.old-dsc-distro>" msgstr "" #. type: TP -#: ../dgit.1:1525 +#: ../dgit.1:1622 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.>I<protocol>" msgstr "" #. type: TP -#: ../dgit.1:1527 +#: ../dgit.1:1624 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.bad-syntax>" msgstr "" #. type: TP -#: ../dgit.1:1529 +#: ../dgit.1:1626 #, no-wrap msgid "B<dgit.default.dsc-url-proto-ok>" msgstr "" #. type: TP -#: ../dgit.1:1531 +#: ../dgit.1:1628 +#, no-wrap +msgid "B<dgit.default.push-subcmd>I< >B<source>I<|>B<built>I<|>B<warn,built>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1632 +msgid "Controls the behaviour of B<dgit push>." +msgstr "" + +#. type: TP +#: ../dgit.1:1632 #, no-wrap msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]" msgstr "" #. type: SH -#: ../dgit.1:1533 +#: ../dgit.1:1634 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" #. type: TP -#: ../dgit.1:1534 +#: ../dgit.1:1635 #, no-wrap msgid "B<DGIT_SSH>, B<GIT_SSH>" msgstr "" #. type: Plain text -#: ../dgit.1:1543 +#: ../dgit.1:1644 msgid "" "specify an alternative default program (and perhaps arguments) to use " "instead of ssh. DGIT_SSH is consulted first and may contain arguments; if " @@ -2832,26 +3019,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1543 +#: ../dgit.1:1644 #, no-wrap msgid "B<DEBEMAIL>, B<DEBFULLNAME>" msgstr "" #. type: Plain text -#: ../dgit.1:1547 +#: ../dgit.1:1648 msgid "" "Default git user.email and user.name for new trees. See B<dgit setup-new-" "tree>." msgstr "" #. type: TP -#: ../dgit.1:1547 +#: ../dgit.1:1648 #, no-wrap msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, [B<lib>]B<curl>, B<dput>" msgstr "" #. type: Plain text -#: ../dgit.1:1552 +#: ../dgit.1:1653 msgid "" "and other subprograms and modules used by dgit are affected by various " "environment variables. Consult the documentation for those programs for " @@ -2859,13 +3046,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1552 +#: ../dgit.1:1653 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: ../dgit.1:1559 +#: ../dgit.1:1660 msgid "" "There should be a `dgit rebase-prep' command or some such to turn a fast-" "forwarding branch containing pseudo-merges back into a rebasing patch " @@ -2873,7 +3060,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1565 +#: ../dgit.1:1666 msgid "" "If the dgit push fails halfway through, it is not necessarily restartable " "and idempotent. It would be good to check that the proposed signing key is " @@ -2881,7 +3068,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1570 +#: ../dgit.1:1671 msgid "" "dgit's build functions, and dgit push, may make changes to your current " "HEAD. Sadly this is necessary for packages in the `3.0 (quilt)' source " @@ -2890,7 +3077,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1575 +#: ../dgit.1:1676 msgid "" "--dry-run does not always work properly, as not doing some of the git " "fetches may result in subsequent actions being different. Doing a non-dry-" @@ -2898,25 +3085,25 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1575 ../dgit.7:23 ../dgit-user.7.pod:447 -#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:524 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:782 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:140 -#: ../git-debrebase.1.pod:634 ../git-debrebase.5.pod:678 +#: ../dgit.1:1676 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:547 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:322 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:637 ../git-debrebase.5.pod:678 #: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: ../dgit.1:1584 +#: ../dgit.1:1685 msgid "" "B<dgit>(7), B<dgit-*>(7), B<curl>(1), B<dput>(1), B<debsign>(1), B<git-" "config>(1), B<git-buildpackage>(1), B<dpkg-buildpackage>(1)," msgstr "" #. type: Plain text -#: ../dgit.1:1585 +#: ../dgit.1:1686 msgid "https://browse.dgit.debian.org/" msgstr "" |