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 (parent:
6ea481c
)
Split brain: Rename $origtree to $unapplied (nfc)
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 4 Jun 2016 11:19:21 +0000
(12:19 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 15:47:47 +0000
(16:47 +0100)
This is clearer.
dgit
patch
|
blob
|
history
diff --git
a/dgit
b/dgit
index 97bd283170e833209d36f2e0bbd3546cf0bea17a..77f8819ef8858307c636aafbfdd9e956053d1d94 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-2533,7
+2533,7
@@
sub quiltify_tree_sentinelfiles ($) {
}
sub quiltify ($$$) {
}
sub quiltify ($$$) {
- my ($clogp,$target,$
origtree
) = @_;
+ my ($clogp,$target,$
unapplied
) = @_;
# Quilt patchification algorithm
#
# Quilt patchification algorithm
#
@@
-2946,9
+2946,8
@@
END
rmtree '.pc';
runcmd @git, qw(add -Af .);
rmtree '.pc';
runcmd @git, qw(add -Af .);
- my $origtree=git_write_tree();
-
- printdebug "fake orig tree object $origtree\n";
+ my $unapplied=git_write_tree();
+ printdebug "fake orig tree object $unapplied\n";
ensuredir '.pc';
ensuredir '.pc';
@@
-2968,7
+2967,7
@@
END
rename '../fake/.pc','.pc' or die $!;
}
rename '../fake/.pc','.pc' or die $!;
}
- quiltify($clogp,$headref,$
origtree
);
+ quiltify($clogp,$headref,$
unapplied
);
if (!open P, '>>', ".pc/applied-patches") {
$!==&ENOENT or die $!;
if (!open P, '>>', ".pc/applied-patches") {
$!==&ENOENT or die $!;