}
}
-sub quiltify_trees_differ ($$) {
- my ($x,$y) = @_;
+sub quiltify_trees_differ ($$;$) {
+ my ($x,$y,$ignoregitignore) = @_;
# returns 1 iff the two tree objects differ other than in debian/
local $/=undef;
my @cmd = (@git, qw(diff-tree --name-only -z), $x, $y);
my $diffs= cmdoutput @cmd;
foreach my $f (split /\0/, $diffs) {
next if $f eq 'debian';
+ next if $f eq '.gitignore' && $ignoregitignore;
return 1;
}
return 0;
}
sub quiltify ($$$) {
- my ($clogp,$target,$origtree) = @_;
+ my ($clogp,$target,$unapplied) = @_;
# Quilt patchification algorithm
#
changedir 'fake';
- ensuredir '.pc';
-
remove_stray_gits();
mktree_in_ud_here();
+ rmtree '.pc';
+
+ runcmd @git, qw(add -Af .);
+ my $unapplied=git_write_tree();
+ printdebug "fake orig tree object $unapplied\n";
+
+ ensuredir '.pc';
+
runcmd qw(sh -ec),
'exec dpkg-source --before-build . >/dev/null';
changedir '..';
- my $origtree='';
-
quilt_fixup_mkwork($headref);
my $mustdeletepc=0;
rename '../fake/.pc','.pc' or die $!;
}
- quiltify($clogp,$headref,$origtree);
+ quiltify($clogp,$headref,$unapplied);
if (!open P, '>>', ".pc/applied-patches") {
$!==&ENOENT or die $!;