X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=6f4565bf017314d7ef109a22886445a628f67783;hb=ab923cd385d0105e1e9316bcb155342fde2a1efb;hp=b06e0782aca0dbc1671f107b33e6568f6583018c;hpb=9f670f31b4b278bae3da080742eeb4853fe95f89;p=dgit.git

diff --git a/dgit b/dgit
index b06e0782..6f4565bf 100755
--- a/dgit
+++ b/dgit
@@ -3127,6 +3127,16 @@ defvalopt '--distro',        '-d', '.+',      \$idistro;
 defvalopt '--existing-package','', '.*',      \$existing_package;
 defvalopt '--build-products-dir','','.*',     \$buildproductsdir;
 defvalopt '--clean',       '', $cleanmode_re, \$cleanmode;
+defvalopt '--quilt',     '', $quilt_modes_re, \$quilt_mode;
+
+defvalopt '', '-c', '.*=.*', sub { push @git, '-c', @_; };
+
+defvalopt '', '-C', '.+', sub {
+    ($changesfile) = (@_);
+    if ($changesfile =~ s#^(.*)/##) {
+	$buildproductsdir = $1;
+    }
+};
 
 defvalopt '--initiator-tempdir','','.*', sub {
     ($initiator_tempdir) = (@_);
@@ -3196,11 +3206,6 @@ sub parseopts () {
 		     ($om = $opts_opt_map{$1})) {
 		push @ropts, $_;
 		push @$om, $2;
-	    } elsif (m/^--quilt=($quilt_modes_re)$/s) {
-		push @ropts, $_;
-		$quilt_mode = $1;
-	    } elsif (m/^--quilt=(.*)$/s) {
-		badusage "unknown quilt fixup mode \`$1'";
 	    } elsif (m/^--ignore-dirty$/s) {
 		push @ropts, $_;
 		$ignoredirty = 1;
@@ -3240,15 +3245,6 @@ sub parseopts () {
 		    push @ropts, $&;
 		    push @changesopts, $_;
 		    $_ = '';
-		} elsif (s/^-c(.*=.*)//s) {
-		    push @ropts, $&;
-		    push @git, '-c', $1;
-		} elsif (s/^-C(.+)//s) {
-		    push @ropts, $&;
-		    $changesfile = $1;
-		    if ($changesfile =~ s#^(.*)/##) {
-			$buildproductsdir = $1;
-		    }
 		} elsif (s/^-k(.+)//s) {
 		    $keyid=$1;
 		} elsif (m/^-[dCk]$/) {