Split brain: Add $origtree argument to quiltify (nfc)

[dgit.git] / dgit

diff --git a/dgit b/dgit
index b5082c96360439d98f6d9cae560f9db0d2954fc3..97d8bce52612089af9392a10789868f6b57070d8 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2532,8 +2532,8 @@ sub quiltify_tree_sentinelfiles ($) {
     return $r;
 }
 
-sub quiltify ($$) {
-    my ($clogp,$target) = @_;
+sub quiltify ($$$) {
+    my ($clogp,$target,$origtree) = @_;
 
     # Quilt patchification algorithm
     #
@@ -2943,6 +2943,8 @@ END
 
     changedir '..';
 
+    my $origtree='';
+
     quilt_fixup_mkwork($headref);
 
     my $mustdeletepc=0;
@@ -2954,7 +2956,7 @@ END
         rename '../fake/.pc','.pc' or die $!;
     }
 
-    quiltify($clogp,$headref);
+    quiltify($clogp,$headref,$origtree);
 
     if (!open P, '>>', ".pc/applied-patches") {
        $!==&ENOENT or die $!;