X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=248a7cbfff5f8a0726f3b8ca08f1c242389867ac;hb=d2cd4c0a817d02c4b6f43702a611a1ce76aef7b6;hp=fc9dac73573c3feefb844266fb5063198fa024e0;hpb=0520f2d7a69b10fdf9add5a8eafcb59d41430860;p=dgit.git

diff --git a/dgit b/dgit
index fc9dac73..248a7cbf 100755
--- a/dgit
+++ b/dgit
@@ -100,7 +100,7 @@ our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
 our $splitbraincache = 'dgit-intern/quilt-cache';
 our $rewritemap = 'dgit-rewrite/map';
 
-our @dpkg_source_ignores = qw(-i\.git/ -I.git);
+our @dpkg_source_ignores = qw(-i(?:^|/)\.git(?:/|$) -I.git);
 
 our (@git) = qw(git);
 our (@dget) = qw(dget);
@@ -6072,7 +6072,8 @@ sub cmd_gbp_build {
     }
     my @cmd = opts_opt_multi_cmd @gbp_build;
 
-    push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
+    push @cmd, (qw(-us -uc --git-no-sign-tags),
+		"--git-builder=".(shellquote @dbp));
 
     if ($gbp_make_orig) {
 	my $priv = dgit_privdir();
@@ -6425,6 +6426,15 @@ sub cmd_print_dgit_repos_server_source_url {
     print $url, "\n" or die $!;
 }
 
+sub pre_print_dpkg_source_ignores {
+    not_necessarily_a_tree();
+}
+sub cmd_print_dpkg_source_ignores {
+    badusage "no arguments allowed to dgit print-dpkg-source-ignores"
+	if @ARGV;
+    print "@dpkg_source_ignores\n" or die $!;
+}
+
 sub cmd_setup_mergechangelogs {
     badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
     local $isuite = 'DGIT-SETUP-TREE';