From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 26 Jul 2015 14:21:04 +0000 (+0100)
Subject: When source package contains things called .git (even files, and even in subdirectori... 
X-Git-Tag: debian/1.1~44
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=b08cca6630e64c51ec712c8acf72397faf7ab700

When source package contains things called .git (even files, and even in subdirectories), remove them.  Closes:#793671.
---

diff --git a/debian/changelog b/debian/changelog
index c3e0a991..16641437 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,8 @@ dgit (1.1) unstable; urgency=low
   * Make warnings fatal in dpkg-repos-admin-debian, dgit-ssh-dispatch
     (using setup_sigwarn).
   * Make warnings fatal in tstunt/dpkg-parsechangelog (directly).
+  * When source package contains things called .git (even files, and even
+    in subdirectories), remove them.  Closes:#793671.
 
  --
 
diff --git a/dgit b/dgit
index 9dadc8cc..687ebe14 100755
--- a/dgit
+++ b/dgit
@@ -1165,7 +1165,21 @@ sub mktree_in_ud_from_only_subdir () {
     $dirs[0] =~ m#^([^/]+)/\.$# or die;
     my $dir = $1;
     changedir $dir;
-    fail "source package contains .git directory" if stat_exists '.git';
+
+    my @gitscmd = qw(find -name .git -prune -print0);
+    debugcmd "|",@gitscmd;
+    open GITS, "-|", @gitscmd or failedcmd @gitscmd;
+    {
+	local $/="\0";
+	while (<GITS>) {
+	    chomp or die;
+	    print STDERR "$us: warning: removing from source package: ",
+		(messagequote $_), "\n";
+	    rmtree $_;
+	}
+    }
+    $!=0; $?=0; close GITS or failedcmd @gitscmd;
+
     mktree_in_ud_here();
     my $format=get_source_format();
     if (madformat($format)) {