From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 5 Sep 2016 21:39:43 +0000 (+0100)
Subject: dgit: Make maybe_unapply_patches_again reset $patches_applied_dirtily
X-Git-Tag: archive/debian/2.0~179
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=d47fb5aa53e92957244c8045f64b450214340c89

dgit: Make maybe_unapply_patches_again reset $patches_applied_dirtily

That makes it idempotent.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index c105aea3..7ccaec42 100755
--- a/dgit
+++ b/dgit
@@ -3884,6 +3884,7 @@ sub maybe_unapply_patches_again () {
 	if $patches_applied_dirtily & 01;
     rmtree '.pc'
 	if $patches_applied_dirtily & 02;
+    $patches_applied_dirtily = 0;
 }
 
 #----- other building -----