chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
3b69b27
)
Split brain: Add $origtree argument to quiltify (nfc)
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 4 Jun 2016 10:35:58 +0000
(11:35 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 15:47:46 +0000
(16:47 +0100)
Currently not used, nor any sensible value passed.
dgit
patch
|
blob
|
history
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 $!;