diff options
| -rwxr-xr-x | dgit | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -2540,8 +2540,8 @@ sub quilt_could_gbp ($$$) { quiltify_trees_differ($userhead,$applied,1); } -sub quiltify ($$$) { - my ($clogp,$target,$unapplied) = @_; +sub quiltify ($$$$) { + my ($clogp,$target,$unapplied,$oldtiptree) = @_; # Quilt patchification algorithm # @@ -2567,12 +2567,6 @@ sub quiltify ($$$) { # After traversing PT, we git commit the changes which # should be contained within debian/patches. - changedir '../fake'; - rmtree '.pc'; - runcmd @git, qw(add -Af .); - my $oldtiptree=git_write_tree(); - changedir '../work'; - # The search for the path S..T is breadth-first. We maintain a # todo list containing search nodes. A search node identifies a # commit, and looks something like this: @@ -2994,7 +2988,13 @@ END rename '../fake/.pc','.pc' or die $!; } - quiltify($clogp,$headref,$unapplied); + changedir '../fake'; + rmtree '.pc'; + runcmd @git, qw(add -Af .); + my $oldtiptree=git_write_tree(); + changedir '../work'; + + quiltify($clogp,$headref,$unapplied,$oldtiptree); if (!open P, '>>', ".pc/applied-patches") { $!==&ENOENT or die $!; |