X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=d6a632682574d4096fb45dd346289f4a12c3d47f;hb=50419637c2d62d5368a52b6ddb3011f6a75b3b0d;hp=356b48c6ca1dc6dcdfc51613c9bdd02f987ee486;hpb=9a0e08c9ff1d9b3a53e8399290afcee426f76f7c;p=dgit.git

diff --git a/dgit b/dgit
index 356b48c6..d6a63268 100755
--- a/dgit
+++ b/dgit
@@ -4938,6 +4938,17 @@ END
     printdone "build successful, results in $result\n" or die $!;
 }
 
+sub postbuild_mergechanges_vanilla ($) {
+    my ($wantsrc) = @_;
+    if ($wantsrc == 1) {
+	in_parent {
+	    postbuild_mergechanges(undef);
+	};
+    } else {
+	printdone "build successful\n";
+    }
+}
+
 sub cmd_build {
     my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
     my $wantsrc = massage_dbp_args \@dbp;
@@ -4952,7 +4963,7 @@ sub cmd_build {
 	runcmd_ordryrun_local @dbp;
     }
     maybe_unapply_patches_again();
-    printdone "build successful\n";
+    postbuild_mergechanges_vanilla $wantsrc;
 }
 
 sub pre_gbp_build {
@@ -4988,7 +4999,7 @@ sub cmd_gbp_build {
 	push @cmd, changesopts();
 	runcmd_ordryrun_local @cmd, @ARGV;
     }
-    printdone "build successful\n";
+    postbuild_mergechanges_vanilla $wantsrc;
 }
 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0