diff options
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 $!; |