diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-06-04 12:19:21 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-07-16 16:47:47 +0100 |
commit | 7fd3c5ea27a4713cbd9673fd63970e2e0123d332 (patch) | |
tree | 6ad6422fedcc95dc342503d702e78a7828605e90 /dgit | |
parent | 6ea481cc3ed14084a6917b16443d228dc124bbe5 (diff) |
Split brain: Rename $origtree to $unapplied (nfc)
This is clearer.
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -2533,7 +2533,7 @@ sub quiltify_tree_sentinelfiles ($) { } sub quiltify ($$$) { - my ($clogp,$target,$origtree) = @_; + my ($clogp,$target,$unapplied) = @_; # Quilt patchification algorithm # @@ -2946,9 +2946,8 @@ END 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'; @@ -2968,7 +2967,7 @@ END rename '../fake/.pc','.pc' or die $!; } - quiltify($clogp,$headref,$origtree); + quiltify($clogp,$headref,$unapplied); if (!open P, '>>', ".pc/applied-patches") { $!==&ENOENT or die $!; |