Better error when source package contains .git. Closes: #720555.

diff --git a/debian/changelog b/debian/changelog
index aa06a7f8af89d0d1a775007fe9a4440166f4793b..ac436431532fcf1e8288aef02461734c2f9230f4 100644 (file)
--- 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 2d47dbfebcf201ce6e465e449de15e38e96ccf39..645528f63c6f7f22dfc59a103fbb0e0452b9dd4d 100755 (executable)
--- 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');