dgit: Rename --ignore-dirty to --include-dirty

Leaving the old name supported as a deprecated alias.

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

diff --git a/debian/changelog b/debian/changelog
index c0bbcb9bbfcb5e89b10b59e529729fa288b0fded..d936d228352d1443576d442f0ebc6130b42a4c5d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ dgit (5.11~) unstable; urgency=medium
     configuration key.  Closes:#857316.  [ Sean Whitton. ]
     Still does not always work, due to #863582.
   * dgit: Minor internal improvements.
+  * dgit: Rename --ignore-dirty to --include-dirty (leaving the old
+    name supported as a deprecated alias).
 
  --
 

diff --git a/dgit b/dgit
index eca2303e86add5d5aa9677fc5cff529b97eddc81..2dd8ef1496fa702a627bb9c35a91b44ae905fb93 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -6864,7 +6864,7 @@ sub parseopts () {
            } elsif (m/^--(gbp|dpm)$/s) {
                push @ropts, "--quilt=$1";
                $quilt_mode = $1;
-           } elsif (m/^--ignore-dirty$/s) {
+           } elsif (m/^--(?:ignore|include)-dirty$/s) {
                push @ropts, $_;
                $includedirty = 1;
            } elsif (m/^--no-quilt-fixup$/s) {

diff --git a/dgit.1 b/dgit.1
index ddb0c0a05b278f08760982d468262c0102b93641..f0d637df00ba6ca29cac5fb3bfffa4256b099a48 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -529,12 +529,17 @@ 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.
 .TP
-.BR --ignore-dirty
-Do not complain if the working tree does not match your git HEAD.
+.BR --include-dirty
+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 with build, if you plan to commit later.  (dgit
 push will still ensure that the .dsc you upload and the git tree
 you push are identical, so this option won't make broken pushes.)
 .TP
+.BR --ignore-dirty
+Deprecated alias for --include-dirty.
+.TP
 .BR --overwrite [=\fIprevious-version\fR]
 Declare that your HEAD really does contain
 all the (wanted) changes