dgit: Rename --dgit-view-save to --save-dgit-view, leaving an alias.

This name makes more sense.

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

diff --git a/debian/changelog b/debian/changelog
index cb9f3df9a07687b8c9723f4294880ad5bb16bf0a..4ea57ef27f9625c155ffa18e00d1299a1ecd2371 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ dgit (6.5~) unstable; urgency=medium
 
   * test suite: Add t-tstunt-parsechangelog to many gdr tests.
   * test suite: editing a test script overrides DGIT_TESTS_PROGRESSIVE.
+  * dgit: Rename --dgit-view-save to --save-dgit-view, leaving an alias.
 
  --
 

diff --git a/dgit b/dgit
index 0da0c7f1d624817c2b84f6ed5a24be74fb2831c8..a5745a55c6b35b19f1ff1571465d210078d4c317 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -6953,7 +6953,10 @@ sub parseopts () {
            } elsif (m/^--delayed=(\d+)$/s) {
                push @ropts, $_;
                push @dput, $_;
-           } elsif (my ($k,$v) = m/^--(dgit-view)-save=(.+)$/s) {
+           } elsif (my ($k,$v) =
+                    m/^--save-(dgit-view)=(.+)$/s ||
+                    m/^--(dgit-view)-save=(.+)$/s
+                    ) {
                push @ropts, $_;
                $v =~ s#^(?!refs/)#refs/heads/#;
                $internal_object_save{$k} = $v;

diff --git a/dgit.1 b/dgit.1
index a4b169430040c02e93138ac3ddec9bbd223ba61e..4ea34da50a8f975879e0112be509cb98342b9717 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -661,7 +661,7 @@ Also,
 it can mean that
 dgit fails to find necessary git commits.
 .TP
-.BR --dgit-view-save= \fIbranch\fR|\fIref\fR
+.BR --save-dgit-view= \fIbranch\fR|\fIref\fR
 Specifies that when a split view quilt mode is in operation,
 and dgit calculates
 (or looks up in its cache)
@@ -681,6 +681,10 @@ And it is only effective with
 If ref does not start with refs/
 it is taken to to be a branch -
 i.e. refs/heads/ is prepended.
+
+.B --dgit-view-save
+is a deprecated alias for
+--save-dgit-view.
 .TP
 .BI --deliberately- something
 Declare that you are deliberately doing