X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=45eef630367ae6a1ba7d4fa6ab1b5255671f2515;hb=8eb4d3531c65dc7afa2bbfe56d535faa756da073;hp=54a1c154f30afa153951a5c6e7087e0a6f6b08bf;hpb=6bce7517ee43b52e0a23c74dec8f5d0bcb7d0668;p=dgit.git

diff --git a/dgit b/dgit
index 54a1c154..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]
@@ -398,7 +417,7 @@ our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
 
 sub runcmd {
     debugcmd "+",@_;
-    $!=0; $?=0;
+    $!=0; $?=-1;
     failedcmd @_ if system @_;
 }
 
@@ -1259,7 +1278,7 @@ sub remove_stray_gits () {
 sub mktree_in_ud_from_only_subdir () {
     # changes into the subdir
     my (@dirs) = <*/.>;
-    die unless @dirs==1;
+    die "@dirs ?" unless @dirs==1;
     $dirs[0] =~ m#^([^/]+)/\.$# or die;
     my $dir = $1;
     changedir $dir;
@@ -1782,9 +1801,9 @@ sub check_not_dirty () {
 
     my @cmd = (@git, qw(diff --quiet HEAD));
     debugcmd "+",@cmd;
-    $!=0; $?=0; system @cmd;
-    return if !$! && !$?;
-    if (!$! && $?==256) {
+    $!=0; $?=-1; system @cmd;
+    return if !$?;
+    if ($?==256) {
 	fail "working tree is dirty (does not match HEAD)";
     } else {
 	failedcmd @cmd;
@@ -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;
@@ -2015,7 +2049,7 @@ END
     my $diffopt = $debuglevel>0 ? '--exit-code' : '--quiet';
     my @diffcmd = (@git, qw(diff), $diffopt, $tree);
     debugcmd "+",@diffcmd;
-    $!=0; $?=0;
+    $!=0; $?=-1;
     my $r = system @diffcmd;
     if ($r) {
 	if ($r==256) {