chiark / gitweb /
build modes handling: Check for stray .changes on all split brain build entries
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 25 Oct 2016 15:58:37 +0000 (16:58 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 25 Oct 2016 15:58:37 +0000 (16:58 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit

diff --git a/dgit b/dgit
index 911ad4e..7508fe1 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -4950,6 +4950,11 @@ END
        if @unwanted;
 }
 
+sub midbuild_checkchanges_vanilla ($) {
+    my ($wantsrc) = @_;
+    midbuild_checkchanges() if $wantsrc == 1;
+}
+
 sub postbuild_mergechanges_vanilla ($) {
     my ($wantsrc) = @_;
     if ($wantsrc == 1) {
@@ -4966,6 +4971,7 @@ sub cmd_build {
     my $wantsrc = massage_dbp_args \@dbp;
     if ($wantsrc > 0) {
        build_source();
+       midbuild_checkchanges_vanilla $wantsrc;
     } else {
        build_prep();
     }
@@ -5000,6 +5006,7 @@ sub cmd_gbp_build {
 
     if ($wantsrc > 0) {
        build_source();
+       midbuild_checkchanges_vanilla $wantsrc;
     } else {
        if (!$clean_using_builder) {
            push @cmd, '--git-cleaner=true';