From 93022741720ca0f2fe56b3d8803a515147e5c5f7 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 4 Jun 2016 11:35:58 +0100 Subject: [PATCH] Split brain: Add $origtree argument to quiltify (nfc) Currently not used, nor any sensible value passed. --- dgit | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dgit b/dgit index b5082c96..97d8bce5 100755 --- 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 $!; -- 2.30.2