From 340a659359f6e9537513355fcbd7309c4d45a10d Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 25 Jul 2018 19:36:52 +0800 Subject: [PATCH] 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 --- dgit | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; } -- 2.30.2