summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-22 01:10:31 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-26 01:16:59 +0100
commit4641b8b4f78a82411c8952aed73139483ead9e37 (patch)
treeaeacf03e8b6033124cd90c2192053555fbffa8c2 /dgit
parentebdf444fc97532f96d189bda5921fcdb85edf745 (diff)
dgit: Some extra error reports for wrong split brain mode
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit15
1 files changed, 15 insertions, 0 deletions
diff --git a/dgit b/dgit
index 13c8add..77eae6b 100755
--- a/dgit
+++ b/dgit
@@ -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();