From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 25 Oct 2016 12:05:57 +0000 (+0100)
Subject: absurd git-apply fallback: defend against debian/patches/series being an unusual... 
X-Git-Tag: archive/debian/2.8~7
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=de85fd5178bb68f6f98a955654e89241b337df4c

absurd git-apply fallback: defend against debian/patches/series being an unusual object, in case dpkg-source doesn't.

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

diff --git a/absurd/git b/absurd/git
index 039bbf0c..b78ec3b6 100755
--- a/absurd/git
+++ b/absurd/git
@@ -58,6 +58,7 @@ fi
 
 pwd=`pwd`
 patch=${patch#$pwd/debian/patches/}
+rm -f debian/patches/series
 printf "%s\n" "$patch" >debian/patches/series
 
 dpkg-source --before-build .
diff --git a/debian/changelog b/debian/changelog
index f093fc51..14fbbebe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dgit (2.8~) unstable; urgency=low
 
-  * 
+  * absurd git-apply fallback: defend against debian/patches/series
+    being an unusual object, in case dpkg-source doesn't.
 
  --