From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 16 Jul 2016 23:00:06 +0000 (+0100)
Subject: Innards: Improve mktree_in_ud_from_only_subdir message
X-Git-Tag: archive/debian/2.0~256
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=c26f96c431c935b9cf8044fae9894bfdcadbbc97

Innards: Improve mktree_in_ud_from_only_subdir message

When it finds multiple subdirs, print them.
---

diff --git a/dgit b/dgit
index 1007d816..f46e55a4 100755
--- a/dgit
+++ b/dgit
@@ -1259,7 +1259,7 @@ sub remove_stray_gits () {
 sub mktree_in_ud_from_only_subdir () {
     # changes into the subdir
     my (@dirs) = <*/.>;
-    die unless @dirs==1;
+    die "@dirs ?" unless @dirs==1;
     $dirs[0] =~ m#^([^/]+)/\.$# or die;
     my $dir = $1;
     changedir $dir;