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

diff --git a/dgit b/dgit
index b7e7f7eb..89795013 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",
@@ -5194,8 +5200,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 +5232,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';