summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-06-04 11:35:58 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-16 16:47:46 +0100
commit93022741720ca0f2fe56b3d8803a515147e5c5f7 (patch)
treeb81c5bc4ef2a81def1f10e59858cb94fdff5361d
parent3b69b271b727db4bdb9120c9306ffb361c3bebba (diff)
Split brain: Add $origtree argument to quiltify (nfc)
Currently not used, nor any sensible value passed.
-rwxr-xr-xdgit8
1 files changed, 5 insertions, 3 deletions
diff --git a/dgit b/dgit
index b5082c9..97d8bce 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 $!;