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

diff --git a/dgit b/dgit
index 89795013..4f54379e 100755
--- a/dgit
+++ b/dgit
@@ -2128,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]: $!";
@@ -2149,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, {