From: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed, 25 Jul 2018 11:36:52 +0000 (+0800)
Subject: dgit: build_source_for_push does not try to unapply patches
X-Git-Tag: archive/debian/6.0~19
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=340a659359f6e9537513355fcbd7309c4d45a10d

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 517f50a8..b3c95c7c 100755
--- 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();
-    maybe_unapply_patches_again();
+    die "er, patches are applied dirtily but shouldn't be.."
+      if $patches_applied_dirtily;
     $changesfile = $sourcechanges;
 }