Check for rpush protocol version incompatibility and crash early if incompatible.

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index 6449ea34df2b19f983d9fcfa2c1d81d9dabc38b7..4b27cdab49e5a9ff5295aaec12a913f4ede4573a 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, the
+The

 .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


@@ -165,7 +175,7 @@ them.
 
 build-host and build\-dir can be passed as separate
 arguments; this is assumed to be the case if the first argument
 
 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
+contains no : (except perhaps one in [ ], to support IPv6 address

 literals).
 
 You will need similar enough versions of dgit on the build-host and
 literals).
 
 You will need similar enough versions of dgit on the build-host and


@@ -274,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 ,


@@ -295,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 --dget=).
+argv[0], and is not affected by --dgit=).

 
 For ssh, the default value is taken from the
 .B DGIT_SSH
 
 For ssh, the default value is taken from the
 .B DGIT_SSH


@@ -312,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 ,


@@ -663,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.


@@ -728,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

-\fBdget\fP(1),
+\fBcurl\fP(1),

 \fBdput\fP(1),
 \fBdebsign\fP(1),
 \fBgit-config\fP(1),
 \fBdput\fP(1),
 \fBdebsign\fP(1),
 \fBgit-config\fP(1),