diff options
| -rwxr-xr-x | dgit | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -2556,8 +2556,8 @@ sub quiltify_splitbrain_needed () { } } -sub quiltify_splitbrain ($$) { - my ($clogp, $diffbits) = @_; +sub quiltify_splitbrain ($$$$$) { + my ($clogp, $unapplied, $headref, $diffbits, $editedignores) = @_; if ($quilt_mode !~ m/gbp|dpm/) { # treat .gitignore just like any other upstream file $diffbits = { %$diffbits }; @@ -3056,11 +3056,12 @@ END # We calculate some guesswork now about what kind of tree this might # be. This is mostly for error reporting. + my %editedignores; my $diffbits = { # H = user's HEAD # O = orig, without patches applied # A = "applied", ie orig with H's debian/patches applied - H2O => quiltify_trees_differ($headref, $unapplied, 1), + H2O => quiltify_trees_differ($headref, $unapplied, 1,\%editedignores), H2A => quiltify_trees_differ($headref, $oldtiptree,1), O2A => quiltify_trees_differ($unapplied,$oldtiptree,1), }; @@ -3089,7 +3090,8 @@ END " --quilt=gbp --quilt=dpm --quilt=unapplied ?"; if ($quilt_mode =~ m/gbp|dpm|unapplied/) { - quiltify_splitbrain($clogp, $diffbits); + quiltify_splitbrain($clogp, $unapplied, $headref, + $diffbits, \%editedignores); return; } |