X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=983f97c55b8ae3d4c002b07657107e363c508064;hb=568d065af3a870c52c0b670603fd8853e7cc2a14;hp=4f54379ecdf3f0886d028ca8b0056b0935d1e9fb;hpb=2aa37b1e612e040ce9a661b4e016dc4bb6bd0b08;p=dgit.git

diff --git a/dgit b/dgit
index 4f54379e..983f97c5 100755
--- a/dgit
+++ b/dgit
@@ -1698,7 +1698,8 @@ sub git_add_write_tree () {
     return git_write_tree();
 }
 
-sub remove_stray_gits () {
+sub remove_stray_gits ($) {
+    my ($what) = @_;
     my @gitscmd = qw(find -name .git -prune -print0);
     debugcmd "|",@gitscmd;
     open GITS, "-|", @gitscmd or die $!;
@@ -1706,7 +1707,7 @@ sub remove_stray_gits () {
 	local $/="\0";
 	while (<GITS>) {
 	    chomp or die;
-	    print STDERR "$us: warning: removing from source package: ",
+	    print STDERR "$us: warning: removing from $what: ",
 		(messagequote $_), "\n";
 	    rmtree $_;
 	}
@@ -1714,8 +1715,8 @@ sub remove_stray_gits () {
     $!=0; $?=0; close GITS or failedcmd @gitscmd;
 }
 
-sub mktree_in_ud_from_only_subdir (;$) {
-    my ($raw) = @_;
+sub mktree_in_ud_from_only_subdir ($;$) {
+    my ($what,$raw) = @_;
 
     # changes into the subdir
     my (@dirs) = <*/.>;
@@ -1724,7 +1725,7 @@ sub mktree_in_ud_from_only_subdir (;$) {
     my $dir = $1;
     changedir $dir;
 
-    remove_stray_gits();
+    remove_stray_gits($what);
     mktree_in_ud_here();
     if (!$raw) {
 	my ($format, $fopts) = get_source_format();
@@ -1733,8 +1734,7 @@ sub mktree_in_ud_from_only_subdir (;$) {
 	}
     }
 
-    runcmd @git, qw(add -Af);
-    my $tree=git_write_tree();
+    my $tree=git_add_write_tree();
     return ($tree,$dir);
 }
 
@@ -2151,7 +2151,7 @@ sub generate_commits_from_dsc () {
 
 	runcmd qw(chmod -R +rwX _unpack-tar);
 	changedir "_unpack-tar";
-	remove_stray_gits();
+	remove_stray_gits($f);
 	mktree_in_ud_here();
 	
 	my ($tree) = git_add_write_tree();
@@ -2202,7 +2202,7 @@ sub generate_commits_from_dsc () {
     push @cmd, qw(-x --), $dscfn;
     runcmd @cmd;
 
-    my ($tree,$dir) = mktree_in_ud_from_only_subdir();
+    my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
     if (madformat $dsc->{format}) { 
 	check_for_vendor_patches();
     }
@@ -2212,8 +2212,7 @@ sub generate_commits_from_dsc () {
 	my @pcmd = qw(dpkg-source --before-build .);
 	runcmd shell_cmd 'exec >/dev/null', @pcmd;
 	rmtree '.pc';
-	runcmd @git, qw(add -Af);
-	$dappliedtree = git_write_tree();
+	$dappliedtree = git_add_write_tree();
     }
 
     my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
@@ -3881,7 +3880,7 @@ END
     progress "checking that $dscfn corresponds to HEAD";
     runcmd qw(dpkg-source -x --),
         $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
-    my ($tree,$dir) = mktree_in_ud_from_only_subdir();
+    my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
     check_for_vendor_patches() if madformat($dsc->{format});
     changedir '../../../..';
     my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
@@ -5205,7 +5204,7 @@ sub quilt_fixup_multipatch ($$$) {
 
     changedir 'fake';
 
-    remove_stray_gits();
+    remove_stray_gits("source package");
     mktree_in_ud_here();
 
     rmtree '.pc';