X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=77eae6b0dafedafb69b441a33c731c4478b571bf;hb=4641b8b4f78a82411c8952aed73139483ead9e37;hp=b1cb9b25dabb8516baa5356817864a62608bbdba;hpb=64d159f5dd06cbe512cfb534a8391d691b30ec6c;p=dgit.git

diff --git a/dgit b/dgit
index b1cb9b25..77eae6b0 100755
--- a/dgit
+++ b/dgit
@@ -65,7 +65,7 @@ our $changes_since_version;
 our $rmchanges;
 our $overwrite_version;
 our $quilt_mode;
-our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|unapplied';
+our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
 our $we_are_responder;
 our $initiator_tempdir;
 our $patches_applied_dirtily = 00;
@@ -1896,7 +1896,7 @@ sub fetch_from_archive () {
     # Finally: we do not necessarily reify the public view (as
     # described above).  This is so that we do not end up stacking two
     # pseudo-merges.  So what we actually do is figure out the inputs
-    # to any public view psuedo-merge and put them in @mergeinputs.
+    # to any public view pseudo-merge and put them in @mergeinputs.
 
     my @mergeinputs;
     # $mergeinputs[]{Commit}
@@ -3316,6 +3316,13 @@ sub quiltify_splitbrain ($$$$$$) {
 	}  
 	fail $msg;
     }
+    if ($quilt_mode =~ m/dpm/ &&
+	($diffbits->{H2A} & 01)) {
+	fail <<END;
+--quilt=$quilt_mode specified, implying patches-applied git tree
+ but git tree differs from result of applying debian/patches to upstream
+END
+    }
     if ($quilt_mode =~ m/gbp|unapplied/ &&
 	($diffbits->{O2A} & 01)) { # some patches
 	quiltify_splitbrain_needed();
@@ -3325,6 +3332,14 @@ sub quiltify_splitbrain ($$$$$$) {
 	runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
 	runcmd @git, qw(checkout -q dgit-view);
     }
+    if ($quilt_mode =~ m/gbp|dpm/ &&
+	($diffbits->{O2A} & 02)) {
+	fail <<END
+--quilt=$quilt_mode specified, implying that HEAD is for use with a
+ tool which does not create patches for changes to upstream
+ .gitignores: but, such patches exist in debian/patches.
+END
+    }
     if (($diffbits->{H2O} & 02) && # user has modified .gitignore
 	!($diffbits->{O2A} & 02)) { # patches do not change .gitignore
 	quiltify_splitbrain_needed();