summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
ea2e410)
And pass the result as an argument. Code outside quiltify is going
to want this information.
quiltify_trees_differ($userhead,$applied,1);
}
quiltify_trees_differ($userhead,$applied,1);
}
-sub quiltify ($$$) {
- my ($clogp,$target,$unapplied) = @_;
+sub quiltify ($$$$) {
+ my ($clogp,$target,$unapplied,$oldtiptree) = @_;
# Quilt patchification algorithm
#
# Quilt patchification algorithm
#
# After traversing PT, we git commit the changes which
# should be contained within debian/patches.
# 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:
# 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:
rename '../fake/.pc','.pc' or die $!;
}
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 $!;
if (!open P, '>>', ".pc/applied-patches") {
$!==&ENOENT or die $!;