X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=4f54379ecdf3f0886d028ca8b0056b0935d1e9fb;hp=b7e7f7eb6e49ff2585ce465753dea3ae0e8c12f6;hb=3178be82907d7e3c9d49f9dfa7f03c4b4884d867;hpb=6f4ecf492c297aa6a1f0c2b2652225cd40ce72be

diff --git a/dgit b/dgit
index b7e7f7eb..4f54379e 100755
--- a/dgit
+++ b/dgit
@@ -1693,6 +1693,11 @@ sub git_write_tree () {
     return $tree;
 }
 
+sub git_add_write_tree () {
+    runcmd @git, qw(add -Af .);
+    return git_write_tree();
+}
+
 sub remove_stray_gits () {
     my @gitscmd = qw(find -name .git -prune -print0);
     debugcmd "|",@gitscmd;
@@ -1891,7 +1896,8 @@ END
 	    push @found_differ, "archive $h->{filename}: ".join "; ", @differ
 		if @differ;
 	}
-	print "origs $file f.same=$found_same #f._differ=$#found_differ\n";
+	printdebug "origs $file f.same=$found_same".
+	    " #f._differ=$#found_differ\n";
 	if (@found_differ && !$found_same) {
 	    fail join "\n",
 		"archive contains $file with different checksum",
@@ -2122,14 +2128,14 @@ sub generate_commits_from_dsc () {
 	    $input = $compr_fh;
 	}
 
-	rmtree "../unpack-tar";
-	mkdir "../unpack-tar" or die $!;
+	rmtree "_unpack-tar";
+	mkdir "_unpack-tar" or die $!;
 	my @tarcmd = qw(tar -x -f -
 			--no-same-owner --no-same-permissions
 			--no-acls --no-xattrs --no-selinux);
 	my $tar_pid = fork // die $!;
 	if (!$tar_pid) {
-	    chdir "../unpack-tar" or die $!;
+	    chdir "_unpack-tar" or die $!;
 	    open STDIN, "<&", $input or die $!;
 	    exec @tarcmd;
 	    die "dgit (child): exec $tarcmd[0]: $!";
@@ -2143,11 +2149,21 @@ sub generate_commits_from_dsc () {
 	# finally, we have the results in "tarball", but maybe
 	# with the wrong permissions
 
-	runcmd qw(chmod -R +rwX ../unpack-tar);
-	changedir "../unpack-tar";
-	my ($tree) = mktree_in_ud_from_only_subdir(1);
-	changedir "../../unpack";
-	rmtree "../unpack-tar";
+	runcmd qw(chmod -R +rwX _unpack-tar);
+	changedir "_unpack-tar";
+	remove_stray_gits();
+	mktree_in_ud_here();
+	
+	my ($tree) = git_add_write_tree();
+	my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
+	if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
+	    $tree = $1;
+	    printdebug "one subtree $1\n";
+	} else {
+	    printdebug "multiple subtrees\n";
+	}
+	changedir "..";
+	rmtree "_unpack-tar";
 
 	my $ent = [ $f, $tree ];
 	push @tartrees, {
@@ -5194,8 +5210,7 @@ sub quilt_fixup_multipatch ($$$) {
 
     rmtree '.pc';
 
-    runcmd @git, qw(add -Af .);
-    my $unapplied=git_write_tree();
+    my $unapplied=git_add_write_tree();
     printdebug "fake orig tree object $unapplied\n";
 
     ensuredir '.pc';
@@ -5227,8 +5242,7 @@ END
 
     changedir '../fake';
     rmtree '.pc';
-    runcmd @git, qw(add -Af .);
-    my $oldtiptree=git_write_tree();
+    my $oldtiptree=git_add_write_tree();
     printdebug "fake o+d/p tree object $unapplied\n";
     changedir '../work';