From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 7 Nov 2016 23:24:54 +0000 (+0000)
Subject: Test suite: import-nonnative: Test origs with .git directories
X-Git-Tag: archive/debian/2.10~8
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=a98d0e0d68a2167e9909ec2da04ebf56c7f97b6f

Test suite: import-nonnative: Test origs with .git directories

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

diff --git a/tests/tests/import-nonnative b/tests/tests/import-nonnative
index 838731a9..244077ec 100755
--- a/tests/tests/import-nonnative
+++ b/tests/tests/import-nonnative
@@ -66,7 +66,7 @@ chk2() {
 		')
 		perl -i~ -pe '
 			s#^\Q'"$pfx"'\E##;
-			$_="" if m/^$/ || m#/$#;
+			$_="" if m/^$/ || m#/$# || m#^\.git/#;
 		' ../files.o
 		orig=${orig#../}
 		pat="^Import ${orig//./\\.}\$"
@@ -129,4 +129,10 @@ mangle1 example 1.0-1
 tar zvcf ../$orig .
 mangle2
 
+# 3.0 (quilt), multiple patches, tarbomb orig with dot and .git
+mangle1 example 1.0-1
+git init
+tar zvcf ../$orig .
+mangle2
+
 echo done.