From 10eb7774037c99711c6f8ca70b3ccfce7215b08e Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 24 Aug 2013 18:12:52 +0100
Subject: [PATCH] Better error when source package contains .git.  Closes:
 #720555.

---
 debian/changelog | 1 +
 dgit             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index aa06a7f8..ac436431 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ dgit (0.9) unstable; urgency=low
   * New cleaning arrangements.
   * More comprehensive workaround for `3.0 (quilt)'.
   * In push, double-check the .changes against the changelog.
+  * Better error when source package contains .git.  Closes: #720555.
 
  --
 
diff --git a/dgit b/dgit
index 2d47dbfe..645528f6 100755
--- a/dgit
+++ b/dgit
@@ -488,7 +488,7 @@ sub mktree_in_ud_from_only_subdir () {
     $dirs[0] =~ m#^([^/]+)/\.$# or die;
     my $dir = $1;
     chdir $dir or die "$dir $!";
-    die if stat '.git';
+    fail "source package contains .git directory" if stat '.git';
     die $! unless $!==&ENOENT;
     runcmd qw(git init -q);
     rmtree('.git/objects');
-- 
2.30.2