Split brain: quiltify_trees_differ supports $ignoregitignore (nfc)

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 97d8bce52612089af9392a10789868f6b57070d8..370986de49a919f60c26e37cedb821edd674148b 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2510,14 +2510,15 @@ END
     }
 }
 
-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;
@@ -2533,7 +2534,7 @@ sub quiltify_tree_sentinelfiles ($) {
 }
 
 sub quiltify ($$$) {
-    my ($clogp,$target,$origtree) = @_;
+    my ($clogp,$target,$unapplied) = @_;
 
     # Quilt patchification algorithm
     #
@@ -2919,7 +2920,8 @@ END
 
     quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
 
-    my @files=qw(debian/source/format debian/rules);
+    my @files=qw(debian/source/format debian/rules
+                 debian/control debian/changelog);
     foreach my $maybe (qw(debian/patches debian/source/options)) {
         next unless stat_exists "../../../$maybe";
         push @files, $maybe;
@@ -2931,7 +2933,8 @@ END
     $dscaddfile->($debtar);
     close $fakedsc or die $!;
 
-    runcmd qw(sh -ec), 'exec dpkg-source --no-check -x fake.dsc >/dev/null';
+    runcmd qw(sh -ec),
+        'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
 
     my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
     rename $fakexdir, "fake" or die "$fakexdir $!";
@@ -2941,9 +2944,18 @@ END
     remove_stray_gits();
     mktree_in_ud_here();
 
-    changedir '..';
+    rmtree '.pc';
+
+    runcmd @git, qw(add -Af .);
+    my $unapplied=git_write_tree();
+    printdebug "fake orig tree object $unapplied\n";
 
-    my $origtree='';
+    ensuredir '.pc';
+
+    runcmd qw(sh -ec),
+        'exec dpkg-source --before-build . >/dev/null';
+
+    changedir '..';
 
     quilt_fixup_mkwork($headref);
 
@@ -2956,7 +2968,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 $!;