chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Two more bug references for changelog
[dgit.git]
/
dgit.1
diff --git
a/dgit.1
b/dgit.1
index b23a3a85c671ebf9ca8f2c73956db70df89573cf..9f9440f9faa508ab07d74605bbf861d97a604729 100644
(file)
--- a/
dgit.1
+++ b/
dgit.1
@@
-59,12
+59,18
@@
The suite's git tip is
left on the local branch
.BI dgit/ suite
ready for work, and on the corresponding dgit remote tracking branch.
left on the local branch
.BI dgit/ suite
ready for work, and on the corresponding dgit remote tracking branch.
-
Also, t
he
+
T
he
.B origin
remote will be set up to point to the package's dgit-repos tree
for the distro to which
.I suite
belongs.
.B origin
remote will be set up to point to the package's dgit-repos tree
for the distro to which
.I suite
belongs.
+
+For your convenience, the
+.B vcs-git
+remote will be set up from the package's Vcs-Git field, if there is
+one - but note that in the general case the history found there may be
+different to or even disjoint from dgit's view.
.TP
\fBdgit fetch\fR [\fIsuite\fP]
Consults the archive and git-repos to update the git view of
.TP
\fBdgit fetch\fR [\fIsuite\fP]
Consults the archive and git-repos to update the git view of
@@
-106,6
+112,10
@@
and
Tagging, signing and actually uploading should be left to dgit push.
.TP
Tagging, signing and actually uploading should be left to dgit push.
.TP
+.B dgit clean
+Cleans the current working tree (according to the --clean= option in
+force).
+.TP
.B dgit help
Print a usage summary.
.TP
.B dgit help
Print a usage summary.
.TP
@@
-167,6
+177,10
@@
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 on in [ ], to support IPv6 address
literals).
arguments; this is assumed to be the case if the first argument
contains no : (except perhaps on in [ ], to support IPv6 address
literals).
+
+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 in its keyring (but not your private key, obviously).
.TP
.B dgit quilt-fixup
Looks to see if the tree is one which dpkg-source cannot properly
.TP
.B dgit quilt-fixup
Looks to see if the tree is one which dpkg-source cannot properly
@@
-217,7
+231,7
@@
Do not clean the tree before building a source package. If there are
files which are not in git, a subsequent dgit push will fail.
.TP
.BR --clean=dpkg-source | -wd
files which are not in git, a subsequent dgit push will fail.
.TP
.BR --clean=dpkg-source | -wd
-Use dpkg-buildpackage to do the
build
, so that the source package
+Use dpkg-buildpackage to do the
clean
, so that the source package
is cleaned by dpkg-source running the package's clean target.
This is the default. It requires the package's build dependencies.
.TP
is cleaned by dpkg-source running the package's clean target.
This is the default. It requires the package's build dependencies.
.TP
@@
-270,9
+284,9
@@
Passed to dpkg-genchanges (eventually).
Specifies a single additional option to pass, eventually, to
dpkg-genchanges.
.TP
Specifies a single additional option to pass, eventually, to
dpkg-genchanges.
.TP
-.RI \fB--
dget
=\fR program |\fB--dput=\fR program |...
+.RI \fB--
curl
=\fR program |\fB--dput=\fR program |...
Specifies alternative programs to use instead of
Specifies alternative programs to use instead of
-.BR
dget
,
+.BR
curl
,
.BR dput ,
.BR debsign ,
.BR dpkg-source ,
.BR dput ,
.BR debsign ,
.BR dpkg-source ,
@@
-291,7
+305,7
@@
this applies only when the program is invoked directly by dgit.
For 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 EDITOR for dpkg-source --commit; this is done using
For 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 EDITOR for dpkg-source --commit; this is done using
-argv[0], and is not affected by --dg
e
t=).
+argv[0], and is not affected by --dg
i
t=).
For ssh, the default value is taken from the
.B DGIT_SSH
For ssh, the default value is taken from the
.B DGIT_SSH
@@
-308,9
+322,9
@@
git to access dgit-repos, only git's idea of what ssh to use (eg,
.BR GIT_SSH )
is relevant.
.TP
.BR GIT_SSH )
is relevant.
.TP
-.RI \fB--
dget
:\fR option |\fB--dput:\fR option |...
+.RI \fB--
curl
:\fR option |\fB--dput:\fR option |...
Specifies a single additional option to pass to
Specifies a single additional option to pass to
-.BR
dget
,
+.BR
curl
,
.BR dput ,
.BR debsign ,
.BR dpkg-source ,
.BR dput ,
.BR debsign ,
.BR dpkg-source ,
@@
-395,6
+409,9
@@
instead. Furthermore, the specified directory will be emptied,
removed and recreated before dgit starts, rather than removed
after dgit finishes. The directory specified must be an absolute
pathname.
removed and recreated before dgit starts, rather than removed
after dgit finishes. The directory specified must be an absolute
pathname.
+.TP
+.BI --no-rm-on-error
+Do not delete the destination directory if clone fails.
.SH WORKFLOW - SIMPLE
It is always possible with dgit to clone or fetch a package, make
changes in git (using git-commit) on the suite branch
.SH WORKFLOW - SIMPLE
It is always possible with dgit to clone or fetch a package, make
changes in git (using git-commit) on the suite branch
@@
-505,6
+522,10
@@
build and dgit push.
To a user looking at the archive, changes pushed using dgit look like
changes made in an NMU: in a `3.0 (quilt)' package the delta from the
previous upload is recorded in a new patch constructed by dpkg-source.
To a user looking at the archive, changes pushed using dgit look like
changes made in an NMU: in a `3.0 (quilt)' package the delta from the
previous upload is recorded in a new patch constructed by dpkg-source.
+.SH READ-ONLY DISTROS
+Distros which do not maintain a set of dgit history git repositories
+can still be used in a read-only mode with dgit. Currently Ubuntu
+is configured this way.
.SH PACKAGE SOURCE FORMATS
If you are not the maintainer, you do not need to worry about the
source format of the package. You can just make changes as you like
.SH PACKAGE SOURCE FORMATS
If you are not the maintainer, you do not need to worry about the
source format of the package. You can just make changes as you like
@@
-652,7
+673,7
@@
interprets it the same way as git does.
See
also the --ssh= and --ssh: options.
.TP
See
also the --ssh= and --ssh: options.
.TP
-.BR gpg ", " dpkg- "..., " debsign ", " git ", "
dget
", " dput ", " LWP::UserAgent
+.BR gpg ", " dpkg- "..., " debsign ", " git ", "
curl
", " dput ", " LWP::UserAgent
and other subprograms and modules used by dgit are affected by various
environment variables. Consult the documentaton for those programs
for details.
and other subprograms and modules used by dgit are affected by various
environment variables. Consult the documentaton for those programs
for details.
@@
-717,7
+738,7
@@
well-defined interface, let alone a secure one.)
fetches may result in subsequent actions being different. Doing a
non-dry-run dgit fetch first will help.
.SH SEE ALSO
fetches may result in subsequent actions being different. Doing a
non-dry-run dgit fetch first will help.
.SH SEE ALSO
-\fB
dget
\fP(1),
+\fB
curl
\fP(1),
\fBdput\fP(1),
\fBdebsign\fP(1),
\fBgit-config\fP(1),
\fBdput\fP(1),
\fBdebsign\fP(1),
\fBgit-config\fP(1),