X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=45eef630367ae6a1ba7d4fa6ab1b5255671f2515;hp=f46e55a4e10969f0604f6b22a01aeebe836285e3;hb=8a178bf100d49ad948f5f3ec5540da1ff9c74c3e;hpb=c26f96c431c935b9cf8044fae9894bfdcadbbc97

diff --git a/dgit b/dgit
index f46e55a4..45eef630 100755
--- a/dgit
+++ b/dgit
@@ -132,6 +132,11 @@ our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
 our $csuite;
 our $instead_distro;
 
+sub debiantag ($$) {
+    my ($v,$distro) = @_;
+    return debiantag_old $v, $distro;
+}
+
 sub lbranch () { return "$branchprefix/$csuite"; }
 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
 sub lref () { return "refs/heads/".lbranch(); }
@@ -213,6 +218,16 @@ sub quiltmode_splitbrain () {
 #  where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
 #  < dgit-remote-push-ready <actual-proto-vsn>
 #
+# occasionally:
+#
+#  > progress NBYTES
+#  [NBYTES message]
+#
+#  > supplementary-message NBYTES          # $protovsn >= 3
+#  [NBYTES message]
+#
+# main sequence:
+#
 #  > file parsed-changelog
 #  [indicates that output of dpkg-parsechangelog follows]
 #  > data-block NBYTES
@@ -227,6 +242,10 @@ sub quiltmode_splitbrain () {
 #  [etc]
 #
 #  > param head HEAD
+#  > param csuite SUITE
+#
+#  > previously REFNAME=OBJNAME       # if --deliberately-not-fast-forward
+#                                     # goes into tag, for replay prevention
 #
 #  > want signed-tag
 #  [indicates that signed tag is wanted]
@@ -1999,7 +2018,22 @@ END
 
     if (madformat($format)) {
 	# user might have not used dgit build, so maybe do this now:
-	commit_quilty_patch();
+	if (quiltmode_splitbrain()) {
+	    my $upstreamversion = $clogp->{Version};
+	    $upstreamversion =~ s/-[^-]*$//;
+	    changedir $ud;
+	    quilt_make_fake_dsc($upstreamversion);
+	    my ($dgitview, $cachekey) =
+		quilt_check_splitbrain_cache($head, $upstreamversion);
+	    $dgitview or fail
+ "--quilt=$quilt_mode but no cached dgit view:
+ perhaps tree changed since dgit build[-source] ?";
+	    $split_brain = 1;
+	    changedir '../../../..';
+	    prep_ud(); # so _only_subdir() works, below
+	} else {
+	    commit_quilty_patch();
+	}
     }
 
     die 'xxx fast forward (should not depend on quilt mode, but will always be needed if we did $split_brain)' if $split_brain;