dgit: build_source_for_push does not try to unapply patches

build_source_for_push should now always build in a worktree, so
patches should never be applied dirtily to $maindir.  Die if it turns
out they were.

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

diff --git a/dgit b/dgit
index 517f50a853ae83f45f96b4f7297678a553c48692..b3c95c7c52544ef9c2a75a71d78cd42dddb2851f 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -6411,7 +6411,8 @@ sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
 
 sub build_source_for_push {
     build_source();
 
 sub build_source_for_push {
     build_source();

-    maybe_unapply_patches_again();
+    die "er, patches are applied dirtily but shouldn't be.."
+      if $patches_applied_dirtily;

     $changesfile = $sourcechanges;
 }
 
     $changesfile = $sourcechanges;
 }