Provide --gbp and --dpm as aliases for --quilt=gbp and --quilt=dpm.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 706092bd6113f2d1a64e8703ffb25ef48ca88b93..af4893b1eb9d8bc13ace2c638adf1d448bb12d04 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ dgit (2.5~) unstable; urgency=medium
     actually identical.  (Eg --quilt=gbp with no patches.)  Closes:#841770.
   * Switch to new archive/ tag format by default, even in
     non-split-brain mode.
     actually identical.  (Eg --quilt=gbp with no patches.)  Closes:#841770.
   * Switch to new archive/ tag format by default, even in
     non-split-brain mode.

+  * Provide --gbp and --dpm as aliases for --quilt=gbp and --quilt=dpm.

 
   Documentation:
   * dgit-maint-merge(7): New tutorial manpage from Sean Whitton.
 
   Documentation:
   * dgit-maint-merge(7): New tutorial manpage from Sean Whitton.

diff --git a/dgit b/dgit
index 5ee61ef95567a5d851f7d8ae4f0f81525ce04cf8..cc9a0581e4bf868bdc818f8058e661441db3784e 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -4608,7 +4608,7 @@ END
         push @failsuggestion, "This might be a patches-applied branch.";
     }
     push @failsuggestion, "Maybe you need to specify one of".
         push @failsuggestion, "This might be a patches-applied branch.";
     }
     push @failsuggestion, "Maybe you need to specify one of".

-        " --quilt=gbp --quilt=dpm --quilt=unapplied ?";
+        " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";

 
     if (quiltmode_splitbrain()) {
        quiltify_splitbrain($clogp, $unapplied, $headref,
 
     if (quiltmode_splitbrain()) {
        quiltify_splitbrain($clogp, $unapplied, $headref,


@@ -5142,6 +5142,9 @@ sub parseopts () {
                     ($om = $opts_opt_map{$1})) {
                push @ropts, $_;
                push @$om, $2;
                     ($om = $opts_opt_map{$1})) {
                push @ropts, $_;
                push @$om, $2;

+           } elsif (m/^--(gbp|dpm)$/s) {
+               push @ropts, "--quilt=$1";
+               $quilt_mode = $1;

            } elsif (m/^--ignore-dirty$/s) {
                push @ropts, $_;
                $ignoredirty = 1;
            } elsif (m/^--ignore-dirty$/s) {
                push @ropts, $_;
                $ignoredirty = 1;

diff --git a/dgit.1 b/dgit.1
index cd2075f18ced11387e9f187ba795862ec63439c6..99ae90bf0b6bf043328f113e28747eece25b3501 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -445,20 +445,24 @@ Do not check whether up source format `3.0 (quilt)' metadata needs
 fixing up.  If you use this option and the metadata did in fact need
 fixing up, dgit push will fail.
 .TP
 fixing up.  If you use this option and the metadata did in fact need
 fixing up, dgit push will fail.
 .TP

-.BR --quilt=gbp " | " --quilt=dpm " | " --quilt=unapplied
+.BR -- [ quilt= ] gbp " | " -- [ quilt= ] dpm " | " --quilt=unapplied

 Tell dgit that you are using a nearly-dgit-compatible git branch,
 aka a
 .BR "maintainer view" ,
 and
 do not want your branch changed by dgit.
 
 Tell dgit that you are using a nearly-dgit-compatible git branch,
 aka a
 .BR "maintainer view" ,
 and
 do not want your branch changed by dgit.
 

-.B --quilt=gbp
+.B --gbp
+(short for
+.BR --quilt=gbp )

 is for use with git-buildpackage.
 Your HEAD is expected to be
 a patches-unapplied git branch, except that it might contain changes
 to upstream .gitignore files.  This is the default for dgit gbp-build.
 
 is for use with git-buildpackage.
 Your HEAD is expected to be
 a patches-unapplied git branch, except that it might contain changes
 to upstream .gitignore files.  This is the default for dgit gbp-build.
 

-.B --quilt=dpm
+.B --dpm
+(short for
+.BR --quilt=dpm )

 is for use with git-dpm.
 Your HEAD is expected to be
 a patches-applied git branch,
 is for use with git-dpm.
 Your HEAD is expected to be
 a patches-applied git branch,