From: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed, 25 Jul 2018 09:17:08 +0000 (+0800)
Subject: dgit: rename $ignoredirty -> $includedirty
X-Git-Tag: archive/debian/6.0~35
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=39af01e68918c91d006674fd1907e61976c69cb8;hp=e898aa91a3a3dd30f83cbc2f2482ad8c189776af

dgit: rename $ignoredirty -> $includedirty

This better reflects the effects that the option has.

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
---

diff --git a/dgit b/dgit
index de81cf98..a5470d4d 100755
--- a/dgit
+++ b/dgit
@@ -66,7 +66,7 @@ our $changesfile;
 our $buildproductsdir;
 our $bpd_glob;
 our $new_package = 0;
-our $ignoredirty = 0;
+our $includedirty = 0;
 our $rmonerror = 1;
 our @deliberatelies;
 our %previously;
@@ -3736,7 +3736,7 @@ sub check_not_dirty () {
 	}
     }
 
-    return if $ignoredirty;
+    return if $includedirty;
 
     git_check_unmodified();
 }
@@ -6865,7 +6865,7 @@ sub parseopts () {
 		$quilt_mode = $1;
 	    } elsif (m/^--ignore-dirty$/s) {
 		push @ropts, $_;
-		$ignoredirty = 1;
+		$includedirty = 1;
 	    } elsif (m/^--no-quilt-fixup$/s) {
 		push @ropts, $_;
 		$quilt_mode = 'nocheck';